diff --git a/.github/workflows/maintenance-linux.yml b/.github/workflows/maintenance-linux.yml
index caf981a696f6..ab7d9eacc388 100644
--- a/.github/workflows/maintenance-linux.yml
+++ b/.github/workflows/maintenance-linux.yml
@@ -33,21 +33,7 @@ jobs:
         working-directory: linux
         run: make all #pull_images=true release=true
 
-      # - name: Upload tarballs as artifacts
-      #   uses: actions/upload-artifact@v3
-      #   with:
-      #     name: linux-${{ env.CRYSTAL_VERSION }}
-      #     path: linux/build/*.gz
-
-      # - name: Upload tarball for use in the next step
-      #   uses: actions/upload-artifact@v3
-      #   with:
-      #     name: tarball
-      #     path: |
-      #       linux/build/*.tar.gz
-      #       !linux/build/*-bundled.tar.gz
-
-  build-linux2:
+  build-x86_64:
     name: Buildx x86 Linux tarballs
     runs-on: ubuntu-latest
     steps:
@@ -81,6 +67,9 @@ jobs:
     name: Build aarch64 Linux tarballs
     runs-on: [linux, ARM64]
     steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build statically linked copiler
         uses: docker/build-push-action@v5
         with:
@@ -91,7 +80,7 @@ jobs:
             crystal_version=${{ env.CRYSTAL_VERSION }}
             crystal_sha1=${{ env.CRYSTAL_SHA1 }}
           outputs: |
-            type=tar,path=linux/crystal-${{ env.CRYSTAL_VERSION }}-1-linux-x86_64.tar
+            type=tar,path=linux/crystal-${{ env.CRYSTAL_VERSION }}-1-linux-aarch64.tar
 
       # - name: Upload tarballs as artifacts
       #   uses: actions/upload-artifact@v3
@@ -99,18 +88,20 @@ jobs:
       #     name: linux-${{ env.CRYSTAL_VERSION }}
       #     path: linux/build/*.gz
 
-      # - name: Upload tarball for use in the next step
-      #   uses: actions/upload-artifact@v3
-      #   with:
-      #     name: tarball
-      #     path: |
-      #       linux/build/*.tar.gz
-      #       !linux/build/*-bundled.tar.gz
+      - name: Upload tarball for use in the next step
+        uses: actions/upload-artifact@v3
+        with:
+          name: tarball
+          path: |
+            linux/build/*.tar.gz
+            !linux/build/*-bundled.tar.gz
 
   package-docker:
     name: Build the docker images
     runs-on: ubuntu-latest
-    needs: build-linux
+    needs:
+      - build-x86_64
+      - bulid-aarch64
     env:
       tag: "crystallang/crystal:${{ inputs.crystal_version || 'master' }}"
     steps: