diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index babe5c8d..87796dcb 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -12,6 +12,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Preflight secrets check
+        env:
+          H: ${{ secrets.DEPLOY_HOST }}
+          U: ${{ secrets.DEPLOY_USER }}
+          K: ${{ secrets.DEPLOY_SSH_KEY }}
+        run: |
+          [ -z "$H" ] || [ -z "$U" ] || [ -z "$K" ] && echo "ERROR: Missing deploy secret. Configure DEPLOY_HOST/DEPLOY_USER/DEPLOY_SSH_KEY in Settings → Actions → Secrets (see issue #1363)" && exit 1
+
       - name: Deploy to host via SSH
         uses: appleboy/ssh-action@v1.0.3
         with:
diff --git a/.gitea/workflows/staging_gate.yml b/.gitea/workflows/staging_gate.yml
index 3a3b27b5..c027d0b6 100644
--- a/.gitea/workflows/staging_gate.yml
+++ b/.gitea/workflows/staging_gate.yml
@@ -13,7 +13,7 @@ jobs:
 
       - name: Verify staging label on merge PR
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN || secrets.MERGE_TOKEN }}
           GITEA_URL: ${{ vars.GITEA_URL || 'https://forge.alexanderwhitestone.com' }}
           GITEA_REPO: Timmy_Foundation/the-nexus
         run: |