diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ca84eb..aa2d95b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,3 @@
-name: CI
-
 on:
   workflow_dispatch:
   push:
@@ -7,29 +5,37 @@ on:
   pull_request:
     branches: [main]
 
-permissions:
-  contents: read
-
+name: Flatpak Nightly
 jobs:
   flatpak:
-    name: "Flatpak"
     runs-on: ubuntu-latest
     container:
       image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
       options: --privileged
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      fail-fast: false
     steps:
-    - uses: actions/checkout@v3
-      with:
-        persist-credentials: false
-    - name: Prepare Runtime
-      run: |
-        flatpak --system remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.node18/${{ matrix.arch }}/23.08
-    - name: Build
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v4
-      with:
-        repository-name: gnome-nightly
-        repository-url: https://nightly.gnome.org/gnome-nightly.flatpakrepo
-        bundle: sticky.flatpak
-        manifest-path: com.vixalien.sticky.json
-        cache-key: flatpak-builder-${{ github.sha }}
+      - uses: actions/checkout@v4
+      - name: Install Docker
+        if: matrix.arch == 'aarch64'
+        run: |
+          dnf -y install docker
+      - name: Setup QEMU
+        if: matrix.arch == 'aarch64'
+        id: qemu
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+      - name: Prepare Runtime
+        run: |
+          flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.node18/${{ matrix.arch }}/23.08
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: com.vixalien.sticky.flatpak
+          repository-name: gnome-nightly
+          repository-url: https://nightly.gnome.org/gnome-nightly.flatpakrepo
+          manifest-path: build-aux/flatpak/com.vixalien.sticky.json
+          cache-key: flatpak-builder-${{ github.sha }}
+          arch: ${{ matrix.arch }}