diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eae946f..c527644 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,26 +23,42 @@ jobs:
         run: cargo fmt --all -- --check
 
   flatpak:
-    name: Flatpak
     runs-on: ubuntu-latest
 
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
+      options: --privileged
+
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install dependencies
+      - name: Install git
         run: |
-          sudo apt-get update
-          sudo apt-get install -y flatpak flatpak-builder xvfb
+          sudo apt-get install -y git
 
-      - name: Add Flathub repo
+      - name: Checkout source
         run: |
-          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          git clone ${GITEA_SERVER_URL}/${GITEA_REPOSITORY}.git .
+          git checkout ${GITEA_SHA}
 
       - name: Build Flatpak
-        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
-        with:
-          bundle: notify.flatpak
-          manifest-path: build-aux/com.ranfdev.Notify.Devel.json
-          repository-name: flathub
-          run-tests: true
-          cache-key: flatpak-builder-${{ github.sha }}
+        run: |
+          xvfb-run --auto-servernum \
+            flatpak-builder \
+            --repo=repo \
+            --force-clean \
+            --install-deps-from=flathub \
+            --default-branch=master \
+            --arch=x86_64 \
+            --ccache \
+            build-dir \
+            build-aux/com.ranfdev.Notify.Devel.json
+
+      - name: Bundle Flatpak
+        run: |
+          flatpak build-bundle repo notify.flatpak com.ranfdev.Notify.Devel
+
+      - name: Upload artifact (Gitea Packages)
+        run: |
+          curl -X POST \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -F "file=@notify.flatpak" \
+            ${GITEA_SERVER_URL}/api/packages/${GITEA_REPOSITORY_OWNER}/generic/notify/latest/notify.flatpak
diff --git a/build-aux/com.ranfdev.Notify.Devel.json b/build-aux/com.ranfdev.Notify.Devel.json
index 8e7a027..5cbe518 100644
--- a/build-aux/com.ranfdev.Notify.Devel.json
+++ b/build-aux/com.ranfdev.Notify.Devel.json
@@ -1,7 +1,7 @@
 {
     "id" : "com.ranfdev.Notify.Devel",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "47",
+    "runtime-version" : "48",
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.rust-stable",