diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index db3cef9..cb659c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,16 +42,16 @@ jobs:
     name: Build base image
     if: ${{ github.event.inputs.buildOnly != 'true' }}
     needs: pre_check
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: [ubuntu-latest,ubuntu-24.04-arm]
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Free Disk-Space
         run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
       - name: Install buildx
         uses: docker/setup-buildx-action@v3
         with:
@@ -73,7 +73,6 @@ jobs:
       - name: Build target base image
         uses: docker/build-push-action@v6
         with:
-          platforms: linux/amd64,linux/arm64
           context: images/base
           pull: true
           push: true
@@ -82,10 +81,12 @@ jobs:
           cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
           cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
       - name: Get download cache key
+        if: ${{ !cancelled() && !contains(matrix.runner, 'arm') }}
         id: dl_cache
         run: |
           echo "dltagname=$(./util/get_dl_cache_tag.sh)" >> $GITHUB_OUTPUT
       - name: Cache
+        if: ${{ !cancelled() && !contains(matrix.runner, 'arm') }}
         uses: actions/cache@v4
         with:
           path: .cache/downloads
@@ -93,11 +94,13 @@ jobs:
           restore-keys: |
             download-cache-
       - name: Update Cache
+        if: ${{ !cancelled() && !contains(matrix.runner, 'arm') }}
         run: |
           set -e
           ./download.sh
           ./util/clean_cache.sh
       - name: Cleanup
+        if: ${{ !cancelled() && !contains(matrix.runner, 'arm') }}
         continue-on-error: true
         uses: BtbN/delete-untagged-ghcr-action@main
         with: