diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml
index 9c2b425..c41a8cd 100644
--- a/.github/workflows/continuous.yml
+++ b/.github/workflows/continuous.yml
@@ -8,7 +8,7 @@ permissions:
   contents: write
 
 jobs:
-  build-and-publish:
+  build:
     name: Build and Publish Flatpak (Continuous)
     runs-on: ubuntu-latest
     steps:
@@ -69,7 +69,6 @@ jobs:
           cp $(cabal list-bin futr) flatpak/futr
 
       - name: Import GPG Key
-        if: ${{ secrets.GPG_PRIVATE_KEY != '' }}
         uses: crazy-max/ghaction-import-gpg@v5
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
@@ -97,3 +96,13 @@ jobs:
           name: futr-flatpak-continuous
           path: com.futrnostr.futr-x86_64
           retention-days: 7
+
+  deploy:
+    name: Deploy to GitHub Pages
+    needs: build
+    runs-on: ubuntu-latest
+    if: ${{ success() }}
+    steps:
+      - name: Deploy to GitHub Pages
+        uses: actions/deploy-pages@v1
+
diff --git a/.github/workflows/flatpak-repo.yml b/.github/workflows/flatpak-repo.yml
deleted file mode 100644
index 23ec8e1..0000000
--- a/.github/workflows/flatpak-repo.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Flatter - Deploy Flatpak Repositories
-
-on:
-  workflow_run:
-    workflows: ["Flatpak Build and Release (Continuous)", "Flatpak Tagged Release"]
-    types:
-      - completed
-
-permissions:
-  pages: write    # Required for GitHub Pages deployment
-  id-token: write # Required for GitHub Pages deployment
-
-jobs:
-  deploy:
-    name: Deploy to GitHub Pages
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fdfdb29..bf9483e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,11 +6,13 @@ on:
       - 'v*'
 
 permissions:
-  contents: write
+  contents: read
+  pages: write    # Required for GitHub Pages deployment
+  id-token: write # Required for GitHub Pages deployment
 
 jobs:
-  flatpak-build-and-release:
-    name: Flatpak Build and Release (Stable)
+  build:
+    name: Build and Release Flatpak
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
@@ -70,7 +72,6 @@ jobs:
           cp $(cabal list-bin futr) flatpak/futr
 
       - name: Import GPG Key
-        if: ${{ secrets.GPG_PRIVATE_KEY != '' }}
         uses: crazy-max/ghaction-import-gpg@v5
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
@@ -112,4 +113,13 @@ jobs:
           tag_name: ${{ github.ref }}
           prerelease: false
           generate_release_notes: true
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.TOKEN }}
+
+  deploy:
+    name: Deploy to GitHub Pages
+    needs: build
+    runs-on: ubuntu-latest
+    if: ${{ success() }}
+    steps:
+      - name: Deploy to GitHub Pages
+        uses: actions/deploy-pages@v1