diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6a3c2e..3d3ce72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,15 +12,29 @@ jobs:
     container:
       image: bilelmoussaoui/flatpak-github-actions:gnome-45
       options: --privileged
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      # Don't fail the whole workflow if one architecture fails
+      fail-fast: false
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
+    - uses: actions/checkout@v4
+    # Docker is required by the docker/setup-qemu-action which enables emulation
+    - 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
     - name: Flatpak Builder
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
+      uses: flatpak/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: page.kramo.Hyperplane.Devel.flatpak
         manifest-path: page.kramo.Hyperplane.Devel.json
         repository-url: https://nightly.gnome.org/gnome-nightly.flatpakrepo
         repository-name: gnome-nightly
-
+        arch: ${{ matrix.arch }}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index b948ede..a72aa62 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -39,7 +39,9 @@ jobs:
       - name: Publish release
         uses: softprops/action-gh-release@v0.1.15
         with:
-          files: page.kramo.Hyperplane.Devel-x86_64/page.kramo.Hyperplane.Devel.flatpak
+          files: |
+            page.kramo.Hyperplane.Devel-x86_64/page.kramo.Hyperplane.Devel.flatpak
+            page.kramo.Hyperplane.Devel-aarch64/page.kramo.Hyperplane.Devel.flatpak
           fail_on_unmatched_files: true
           tag_name: ${{ steps.get_tag_name.outputs.tag_name }}
           body_path: release_notes
diff --git a/hyperplane/utils/thumbnail.py b/hyperplane/utils/thumbnail.py
index ef766a1..f959f26 100644
--- a/hyperplane/utils/thumbnail.py
+++ b/hyperplane/utils/thumbnail.py
@@ -83,7 +83,7 @@ def generate_thumbnail(
                 return
 
         try:
-            # Fallback to GdkPixbuf
+            # Fall back to GdkPixbuf
             thumbnail = GdkPixbuf.Pixbuf.new_from_file_at_size(
                 str(get_gfile_path(gfile)), 256, 256
             )