diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml
deleted file mode 100644
index ee21470..0000000
--- a/.github/workflows/flatpak-build.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# .github/workflows/flatpak-build.yml
-name: Flatpak Build
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install Flatpak and Flatpak Builder
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y flatpak flatpak-builder
-          flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-    
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Get the latest commit ID
-        id: get_commit_id
-        run: echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
-      - name: Update Flatpak Manifest
-        run: |
-          sed -i 's|"url" : "file:///home/tentri/Documents/Alpaca"|"url" : "https://github.com/Jeffser/Alpaca"|g' ./com.jeffser.Alpaca.json
-
-      - name: Build Flatpak
-        run: |
-          flatpak-builder --user --force-clean --repo=repo builddir ./com.jeffser.Alpaca.json
-          
-      - name: Upload Flatpak Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: flatpak-package
-          path: /build
diff --git a/.github/workflows/flatpak-builder.yml b/.github/workflows/flatpak-builder.yml
new file mode 100644
index 0000000..343540f
--- /dev/null
+++ b/.github/workflows/flatpak-builder.yml
@@ -0,0 +1,20 @@
+# .github/workflows/flatpak-build.yml
+on:
+  push:
+    branches: [main]
+  pull_request:
+name: CI
+jobs:
+  flatpak:
+    name: "Flatpak"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v4
+    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+      with:
+        bundle: Alpaca.flatpak
+        manifest-path: com.jeffser.Alpaca.json
+        cache-key: flatpak-builder-${{ github.sha }}