diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 3a68c68..33bd622 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -6,15 +6,30 @@ on:
     branches: [main]
 jobs:
   flatpak:
-      name: "Flatpak"
-      runs-on: ubuntu-latest
-      container:
-        image: bilelmoussaoui/flatpak-github-actions:gnome-45
-        options: --privileged
-      steps:
-      - uses: actions/checkout@v4
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-        with:
-          bundle: goldwarden.flatpak
-          manifest-path: com.quexten.Goldwarden.yml
-          cache-key: flatpak-builder-${{ github.sha }}
\ No newline at end of file
+    name: "Flatpak"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-45
+      options: --privileged
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install deps
+      if: ${{ matrix.arch != 'x86_64' }}
+      run: |
+        dnf -y install docker
+    - name: Set up QEMU
+      if: ${{ matrix.arch != 'x86_64' }}
+      id: qemu
+      uses: docker/setup-qemu-action@v2
+      with:
+        platforms: arm64
+    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+      with:
+        bundle: goldwarden.flatpak
+        manifest-path: com.quexten.Goldwarden.yml
+        cache-key: flatpak-builder-${{ github.sha }}
+        arch: ${{ matrix.arch }}
\ No newline at end of file
diff --git a/com.quexten.Goldwarden.yml b/com.quexten.Goldwarden.yml
index cd50128..ad71012 100644
--- a/com.quexten.Goldwarden.yml
+++ b/com.quexten.Goldwarden.yml
@@ -30,10 +30,9 @@ finish-args:
 modules:
   - ./ui/python3-requirements.json
   - name: wl-clipboard
-    buildsystem: simple
-    build-commands:
-      - meson setup build && cd build && ninja
-      - install -D build/src/wl-copy /app/bin/wl-copy
+    buildsystem: meson 
+    config-opts:
+      - -Dfishcompletiondir=no
     sources:
       - type: git
         url: https://github.com/bugaevc/wl-clipboard.git
@@ -52,8 +51,17 @@ modules:
   - name: goldwarden-core-daemon
     buildsystem: simple
     build-commands:
-      - install -D goldwarden_linux_x86_64 /app/bin/goldwarden
+      - install -D goldwarden_linux_* /app/bin/goldwarden
     sources:
       - type: file
         url: https://github.com/quexten/goldwarden/releases/download/v0.2.5/goldwarden_linux_x86_64
         sha256: 8854594e40516b01d3647c5bd0085442b4c31f715b6c53db91748f0456fa5f2a
+        only-arches: [x86_64]
+      - type: file
+        url: https://github.com/quexten/goldwarden/releases/download/v0.2.5/goldwarden_linux_arm64
+        sha256: 30d3b8ece22557d82ec21aa7b01cfd5b0b50ff489868a4d4ec71d57bf8c4d8c1
+        only-arches: [aarch64]
+      - type: file
+        url: https://github.com/quexten/goldwarden/releases/download/v0.2.5/goldwarden_linux_x86
+        sha256: e1166098f46c4947d176714318c40a96930626c149d73e511ea6ca75099acfbc
+        only-arches: [i386]