diff --git a/.github/workflows/on-release-tag.yml b/.github/workflows/on-release-tag.yml
index 232b41ac..971e96f5 100644
--- a/.github/workflows/on-release-tag.yml
+++ b/.github/workflows/on-release-tag.yml
@@ -18,8 +18,9 @@ jobs:
       - uses: actions/checkout@v2
       - name: Build the kadalu binary
         run: |
-            cd mgr && shards build --production --release --static --no-debug --stats --time
-      - name: Rename the binary
+            cd mgr
+            shards build --production --release --static --no-debug --stats --time
+      - name: Rename kadalu to kadalu-amd64
         run: |
           mv mgr/bin/kadalu mgr/bin/kadalu-amd64
       - name: Upload kadalu-amd64 to the release
@@ -44,8 +45,8 @@ jobs:
       - name: Build
         working-directory: .
         run: |
-          docker run -i -v `pwd`:/workspace -w /workspace --rm multiarch/alpine:aarch64-latest-stable /bin/sh -c "echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' >>/etc/apk/repositories; apk add --update --no-cache --force-overwrite crystal@edge gc-dev gcc gmp-dev libatomic_ops libevent-static musl-dev pcre-dev libxml2-dev openssl-dev openssl-libs-static tzdata yaml-dev zlib-static make git llvm10-dev llvm10-static g++ shards@edge yaml-static; cd mgr && shards build --production --release --static --no-debug --stats --time"
-      - name: Rename
+          docker run -i -v `pwd`:/workspace -w /workspace --rm multiarch/alpine:aarch64-latest-stable /bin/sh -c "echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' >>/etc/apk/repositories; apk add --update --no-cache --force-overwrite crystal@edge gc-dev gcc gmp-dev libatomic_ops libevent-static musl-dev pcre-dev libxml2-dev openssl-dev openssl-libs-static tzdata yaml-dev zlib-static make git llvm10-dev llvm10-static g++ shards@edge yaml-static; cd mgr; shards build --production --release --static --no-debug --stats --time"
+      - name: Rename kadalu to kadalu-amd64
         run: |
           sudo mv mgr/bin/kadalu mgr/bin/kadalu-arm64
       - name: Upload kadalu-arm64 to the release
@@ -58,6 +59,7 @@ jobs:
           file_glob: true
 
   upload_service_files:
+    runs-on: ubuntu-latest
     steps:
       - name: Upload kadalu-mgr.service and kadalu-agent.service to the release
         uses: svenstaro/upload-release-action@v2