diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 04d7a0d..167f56c 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -14,67 +14,82 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
+
 on:
   push:
     branches:
       - trunk
-name: CI for Cartero
+  pull_request:
+    branches:
+      - trunk
+name: Build
 jobs:
-
-  Flatpak:
-  #   needs: CreateRelease
-    name: "Flatpak Builder"
+  flatpak:
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-45
+      image: bilelmoussaoui/flatpak-github-actions:gnome-46
       options: --privileged
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+      fail-fast: false
+    name: "Flatpak (${{ matrix.arch }})"
     steps:
       - uses: actions/checkout@v4
-
+      - name: (ARM) Install Docker
+        if: ${{ matrix.arch != 'x86_64' }}
+        run: |
+          dnf -y install docker
+      - name: (ARM) 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: es.danirod.Cartero.flatpak
-          manifest-path: build-aux/es.danirod.Cartero.json
+          bundle: es.danirod.Cartero.Devel.flatpak
+          manifest-path: build-aux/es.danirod.Cartero.Devel.json
           cache-key: flatpak-builder-${{ github.sha }}
           build-bundle: true
-  Deliver:
-
-    name: "Deliver Package"
-    runs-on: ubuntu-latest
-    needs: [Flatpak]
-    permissions : write-all
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
-        with:
-          name: es.danirod.Cartero-x86_64
-          path: .
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Generate Changelog
-        id: changes
-        uses: heinrichreimer/action-github-changelog-generator@v2.3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: release-${{ github.sha }}-${{ github.run_number }}
-          release_name: Release ${{ github.sha }}
-          body: |
-            Changes ${{ steps.changes.outputs.changelog }}
-          draft: false
-          prerelease: false
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./es.danirod.Cartero.flatpak
-          asset_name: es.danirod.Cartero.flatpak
-          asset_content_type: application/octet-stream
\ No newline at end of file
+          arch: ${{ matrix.arch }}
+  # Deliver:
+  #   name: "Deliver Package"
+  #   runs-on: ubuntu-latest
+  #   needs: [Flatpak]
+  #   permissions : write-all
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions/download-artifact@v2
+  #       with:
+  #         name: es.danirod.Cartero-x86_64
+  #         path: .
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Generate Changelog
+  #       id: changes
+  #       uses: heinrichreimer/action-github-changelog-generator@v2.3
+  #       with:
+  #         token: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Create Release
+  #       id: create_release
+  #       uses: actions/create-release@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #       with:
+  #         tag_name: release-${{ github.sha }}-${{ github.run_number }}
+  #         release_name: Release ${{ github.sha }}
+  #         body: |
+  #           Changes ${{ steps.changes.outputs.changelog }}
+  #         draft: false
+  #         prerelease: false
+  #     - name: Upload Release Asset
+  #       id: upload-release-asset
+  #       uses: actions/upload-release-asset@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #       with:
+  #         upload_url: ${{ steps.create_release.outputs.upload_url }}
+  #         asset_path: ./es.danirod.Cartero.flatpak
+  #         asset_name: es.danirod.Cartero.flatpak
+  #         asset_content_type: application/octet-stream
\ No newline at end of file