diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3ded7256..141ad12e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,22 +10,27 @@ jobs:
         include:
           - RELEASE: latest
             ARCH: x86_64
+            RUNS_ON: ubuntu-24.04
           - RELEASE: latest
             ARCH: armhf
+            RUNS_ON: ubuntu-24.04-arm
           - RELEASE: latest
             ARCH: aarch64
+            RUNS_ON: ubuntu-24.04-arm
 
           # special builds
           - RELEASE: latest
             ARCH: x86_64
             BUILD_TYPE: coverage
+            RUNS_ON: ubuntu-24.04
           - RELEASE: latest
             ARCH: x86_64
             BUILD_TYPE: shared-only
             LIBAPPIMAGE_SHARED_ONLY: 1
+            RUNS_ON: ubuntu-24.04
 
     name: ${{ matrix.BUILD_TYPE }} ${{ matrix.DIST }} ${{ matrix.ARCH }} shared-only=${{ matrix.LIBAPPIMAGE_SHARED_ONLY }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.RUNS_ON }}
     env:
       ARCH: ${{ matrix.ARCH }}
       RELEASE: ${{ matrix.RELEASE }}
@@ -35,8 +40,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Set up QEMU integration for Docker
-        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
       - name: Build libappimage and run tests
         run: bash -ex ci/build-in-docker.sh
         env: