diff --git a/.github/workflows/__deploy.yml b/.github/workflows/__deploy.yml
index 06c9500d40..eebc799ddc 100644
--- a/.github/workflows/__deploy.yml
+++ b/.github/workflows/__deploy.yml
@@ -20,7 +20,7 @@ on:
         required: false
         type: boolean
       pr_number:
-        required: true
+        required: false
         type: number
       workflow_run_id:
         required: true
@@ -33,7 +33,7 @@ on:
 jobs:
   progress-comment:
     name: Progress Comment
-    if: ${{ always() }}
+    if: ${{ always() && inputs.comment }}
     uses: ./.github/workflows/__job_messages.yml
     secrets:
       JF_BOT_TOKEN: ${{ secrets.JF_BOT_TOKEN }}
@@ -73,7 +73,7 @@ jobs:
   compose-comment:
     name: Compose and push comment 📝
     # Always run so the comment is composed for the workflow summary
-    if: ${{ always() }}
+    if: ${{ always() && inputs.comment }}
     uses: ./.github/workflows/__job_messages.yml
     secrets: inherit
     needs:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 0e4067f2ac..cc9fc08a0f 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -17,7 +17,8 @@ jobs:
     name: Automation 🎛️
     if: ${{ github.repository == 'jellyfin/jellyfin-web' }}
     uses: ./.github/workflows/__automation.yml
-    secrets: inherit
+    secrets:
+      JF_BOT_TOKEN: ${{ secrets.JF_BOT_TOKEN }}
 
   main:
     name: 'Unstable release 🚀⚠️'
@@ -52,7 +53,12 @@ jobs:
     permissions:
       contents: read
       deployments: write
-    secrets: inherit
+    secrets:
+      JF_BOT_TOKEN: ${{ secrets.JF_BOT_TOKEN }}
+      CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
     with:
-      branch: ${{ github.ref_name }}
+      branch: ${{ format('{0}/{1}', github.repository, github.ref_name) }}
+      commit: ${{ github.sha }}
+      workflow_run_id: ${{ github.run_id }}
       comment: false
diff --git a/.github/workflows/workflow_run.yml b/.github/workflows/workflow_run.yml
index 56ff071d0c..8b703f9151 100644
--- a/.github/workflows/workflow_run.yml
+++ b/.github/workflows/workflow_run.yml
@@ -55,3 +55,4 @@ jobs:
       commit: ${{ github.event.workflow_run.head_sha }}
       workflow_run_id: ${{ github.event.workflow_run.id }}
       pr_number: ${{ needs.metadata.outputs.pr_number }}
+      comment: true