diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index 4bdc122..bdc31e0 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -27,6 +27,7 @@ jobs:
           - {dockerfile: 'ubuntu',   tag: 'devel',        build_args: 'TAG=devel', continue-on-error: 'true'}
           - {dockerfile: 'opensuse', tag: 'latest',       continue-on-error: 'true'}
           - {dockerfile: 'fedora',   tag: 'latest',       build_args: 'GMX_BRANCH=release-2019,GMX_DOUBLE=ON'}
+          - {dockerfile: 'fedora',   tag: 'latest',       build_args: 'GMX_BRANCH=release-2019,GMX_DOUBLE=ON', runner: 'ubuntu-24.04-arm'}
           - {dockerfile: 'fedora',   tag: 'gmx2019',      build_args: 'GMX_BRANCH=release-2019'}
           - {dockerfile: 'fedora',   tag: 'gmx2024_d',    build_args: 'GMX_BRANCH=release-2024,GMX_DOUBLE=ON'}
           - {dockerfile: 'fedora',   tag: 'gmx2024',      build_args: 'GMX_BRANCH=release-2024'}
@@ -36,10 +37,8 @@ jobs:
           - {dockerfile: 'fedora',   tag: 'intel',        build_args: 'TAG=38,INTEL=yes,PYTHON=python3.11', continue-on-error: 'true'}
           - {dockerfile: 'actions',  tag: 'latest'}
           - {dockerfile: 'format',   tag: 'latest'}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.config.arm == 'true' && 'ubuntu-24.04-arm'' || 'ubuntu-latest' }
     steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Login to Gitlab Container Registry
@@ -62,14 +61,6 @@ jobs:
           echo "args<<EOF" >> $GITHUB_OUTPUT 
           echo ${{ matrix.config.build_args }} | sed 's/,/\n/g' >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
-      - name: Generate platforms
-        id: platforms
-        run: |
-          if [ "${{ matrix.config.dockerfile }}:${{ matrix.config.tag }}" = "fedora:latest" ]; then
-            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
-          else
-            echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
-          fi
       - name: Build and Push Docker images for all Container Registries
         uses: docker/build-push-action@v3        
         with:
@@ -80,4 +71,3 @@ jobs:
           build-args: ${{ steps.build_args.outputs.args }}
           pull: true
           push: ${{ github.repository_owner == 'votca' && ( github.event_name == 'push' ||  github.event_name == 'schedule' ) }}
-          platforms: ${{ steps.platforms.outputs.platforms }}