diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index b7422ff..08b35ea 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -33,7 +33,7 @@ jobs:
       run: docker buildx build $(.github/bin/get-buildx-args)
 
   buildx:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-24.04-arm
     name: Build, ${{ matrix.architecture }}
     strategy:
       matrix:
@@ -43,6 +43,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up QEMU
+      if: matrix.architecture != 'linux/arm64'
       uses: docker/setup-qemu-action@v3.3.0
       with:
         platforms: ${{ matrix.architecture }}