diff --git a/.github/workflows/maintenance-linux.yml b/.github/workflows/maintenance-linux.yml
index d9f38bd5e747..f48f0048a166 100644
--- a/.github/workflows/maintenance-linux.yml
+++ b/.github/workflows/maintenance-linux.yml
@@ -27,6 +27,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           repository: crystal-lang/distribution-scripts
+          branch: refactor/linux-makefile-build-context
 
       - name: Build linux binaries
         working-directory: linux
@@ -38,26 +39,35 @@ 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
-  build-arrch64:
-    name: Build aarch64 Linux tarballs
-    runs-on: [linux, ARM64]
+      # - 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:
+    name: Build x86 Linux tarballs
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           repository: crystal-lang/distribution-scripts
+          branch: refactor/linux-makefile-build-context
 
-      - name: Build linux binaries
-        uses: docker://jhass/crystal:1.0.0-alpine-build
-        working-directory: linux
+      - name: Build statically linked copiler
+        uses: docker/build-push-action@v5
         with:
-          args: make all #pull_images=true release=true
+          file: linux/Dockerfile
+          push: false
+          load: true
+          build-args: |
+            previous_crystal_release=https://github.com/crystal-lang/crystal/releases/download/${{ env.PREVIOUS_CRYSTAL_VERSION }}/crystal-${{ env.PREVIOUS_CRYSTAL_VERSION }}-1-linux-x86_64.tar.gz
+            crystal_version=${{ env.CRYSTAL_VERSION }}
+            crystal_sha1=${{ env.CRYSTAL_SHA1 }}
+          outputs: |
+            type=tar,path=linux/crystal-${{ env.CRYSTAL_VERSION }}-1-linux-x86_64.tar
 
       # - name: Upload tarballs as artifacts
       #   uses: actions/upload-artifact@v3
@@ -73,6 +83,35 @@ jobs:
             linux/build/*.tar.gz
             !linux/build/*-bundled.tar.gz
 
+  # build-aarch64:
+  #   name: Build aarch64 Linux tarballs
+  #   runs-on: [linux, ARM64]
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         repository: crystal-lang/distribution-scripts
+  #         branch: refactor/linux-makefile-build-context
+
+  #     - name: Build linux binaries
+  #       uses: docker://jhass/crystal:1.0.0-alpine-build # this is only to get an environment with make
+  #       #working-directory: linux
+  #       with:
+  #         args: 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
+
   package-docker:
     name: Build the docker images
     runs-on: ubuntu-latest