diff --git a/.github/workflows/inbox-steward.yml b/.github/workflows/inbox-steward.yml
index 8e435567..b3f3c326 100644
--- a/.github/workflows/inbox-steward.yml
+++ b/.github/workflows/inbox-steward.yml
@@ -166,7 +166,7 @@ jobs:
       - name: Validate PRs
         id: validate
         env:
-          GH_TOKEN: ${{ secrets.FARM_PAT }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PRS_JSON: ${{ needs.identify-passed-prs.outputs.prs_to_process }}
           DRY_RUN: ${{ inputs.dry_run }}
         run: |
@@ -384,7 +384,7 @@ jobs:
 
       - name: Send dispatch to Hypatia
         env:
-          GH_TOKEN: ${{ secrets.FARM_PAT || secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.FARM_DISPATCH_TOKEN || secrets.GITHUB_TOKEN }}
           PR_COUNT: ${{ needs.identify-passed-prs.outputs.pr_count }}
           VALIDATED_JSON: ${{ needs.validate-prs.outputs.validated_prs || '[]' }}
           MERGED_COUNT: ${{ needs.auto-merge-prs.outputs.merged_count || '0' }}
diff --git a/.github/workflows/supervised-fleet-scan.yml b/.github/workflows/supervised-fleet-scan.yml
index ab440b4d..66da24f2 100644
--- a/.github/workflows/supervised-fleet-scan.yml
+++ b/.github/workflows/supervised-fleet-scan.yml
@@ -46,14 +46,14 @@ jobs:
           INVENTORY_FILE: ${{ github.event.inputs.inventory_file || '' }}
           PROCESS_FINDINGS: ${{ github.event.inputs.process_findings || 'true' }}
           FLEET_SUPERVISED_REPOS_FILE: ${{ github.event.inputs.inventory_file || '' }}
-          # FLEET_SCAN_PAT is required for Hypatia's DependabotAlerts
+          # HYPATIA_SCAN_PAT is required for Hypatia's DependabotAlerts
           # rule (DA001-DA004) to query per-repo Dependabot alerts via
           # the GitHub REST API. This PAT must have `security_events: read`
           # scope on ALL target repos. Without it, cross-repo alerts will
           # be MISSING. The built-in GITHUB_TOKEN is insufficient for
           # estate-wide scanning. See:
           # 007-lang/audits/audit-dependabot-automation-gap-2026-04-17.md.
-          GITHUB_TOKEN: ${{ secrets.FLEET_SCAN_PAT }}
+          GITHUB_TOKEN: ${{ secrets.HYPATIA_SCAN_PAT }}
           # HYPATIA_SEVERITY=low surfaces low-severity findings from
           # every rule module. The Hypatia CLI's default threshold is
           # "medium"; without this override, low-severity findings