diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58bac78..b6bff13 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,29 +10,27 @@ on:
 
 jobs:
   flatpak:
-    name: Flatpak
-    runs-on: ubuntu-latest
+    name: Flatpak (${{ matrix.configuration.arch }})
+    runs-on: ${{ matrix.configuration.runs-on }}
 
     strategy:
       matrix:
-        arch: [x86_64, aarch64]
+        configuration:
+          - arch: x86_64
+            runs-on: ubuntu-latest
+          - arch: aarch64
+            runs-on: ubuntu-24.04-arm
       # Don't fail the whole workflow if one architecture fails
       fail-fast: false
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.arch }}
+      image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
       options: --privileged
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up QEMU for aarch64 emulation
-        if: ${{ matrix.arch != 'x86_64' }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-
       - name: Build
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6.4
         with:
@@ -41,4 +39,4 @@ jobs:
           repository-name: elementary
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo
           cache-key: "flatpak-builder-${{ github.sha }}"
-          arch: ${{ matrix.arch }}
+          arch: ${{ matrix.configuration.arch }}
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 20937c0..be3164c 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -8,29 +8,27 @@ on:
 
 jobs:
   deploy_flatpak:
-    name: Deploy Flatpak
-    runs-on: ubuntu-latest
+    name: Deploy Flatpak (${{ matrix.configuration.arch }})
+    runs-on: ${{ matrix.configuration.runs-on }}
 
     strategy:
       matrix:
-        arch: [x86_64, aarch64]
+        configuration:
+          - arch: x86_64
+            runs-on: ubuntu-latest
+          - arch: aarch64
+            runs-on: ubuntu-24.04-arm
       # Don't fail the whole workflow if one architecture fails
       fail-fast: false
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.arch }}
+      image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
       options: --privileged
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up QEMU for aarch64 emulation
-        if: ${{ matrix.arch != 'x86_64' }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-
       - name: Build
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6.4
         with:
@@ -40,7 +38,7 @@ jobs:
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo
           cache-key: "flatpak-builder-${{ github.sha }}"
           branch: stable
-          arch: ${{ matrix.arch }}
+          arch: ${{ matrix.configuration.arch }}
       - name: Deploy
         uses: flatpak/flatpak-github-actions/flat-manager@v6.4
         with: