diff --git a/.github/workflows/flatpak-testing.yml b/.github/workflows/flatpak-nightly.yml
similarity index 57%
rename from .github/workflows/flatpak-testing.yml
rename to .github/workflows/flatpak-nightly.yml
index 10372eed..a72012d4 100644
--- a/.github/workflows/flatpak-testing.yml
+++ b/.github/workflows/flatpak-nightly.yml
@@ -1,21 +1,34 @@
 on:
   schedule:
     - cron: "0 0 * * *"
-name: "Flatpak Testing"
+name: "Flatpak Nightly"
 jobs:
   flatpak:
     name: "Flatpak"
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-40
+      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
       options: --privileged
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      fail-fast: false
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
+    - name: Install Docker
+      run: |
+        dnf -y install docker
+    - name: Setup QEMU
+      id: qemu
+      uses: docker/setup-qemu-action@v1
+      with:
+        platforms: arm64
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
       name: "Build"
       with:
         bundle: com.github.rafostar.Clapper.flatpak
         manifest-path: pkgs/flatpak/com.github.rafostar.Clapper-testing.json
         cache-key: flatpak-builder-${{ github.sha }}-testing-${{ github.run_number }}
+        arch: ${{ matrix.arch }}
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 2c79106b..b1bd16bc 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -13,13 +13,26 @@ jobs:
     container:
       image: bilelmoussaoui/flatpak-github-actions:gnome-40
       options: --privileged
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      fail-fast: false
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
+    - name: Install Docker
+      run: |
+        dnf -y install docker
+    - name: Setup QEMU
+      id: qemu
+      uses: docker/setup-qemu-action@v1
+      with:
+        platforms: arm64
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
       name: "Build"
       with:
         bundle: com.github.rafostar.Clapper.flatpak
         manifest-path: pkgs/flatpak/com.github.rafostar.Clapper.json
         cache-key: flatpak-builder-${{ github.sha }}
+        arch: ${{ matrix.arch }}