diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 9985a74a3..2d2fb5a2f 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -17,6 +17,13 @@ concurrency:
 permissions: {}
 
 jobs:
+  analysis:
+    name: Analysis
+    permissions:
+      contents: read
+      security-events: write
+    uses: ./.github/workflows/reusable-analysis.yml
+
   init:
     name: Initialize
     permissions:
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index aa567d7cc..ab363bbdf 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -48,6 +48,13 @@ jobs:
      needs: [deploys]
      uses: ./.github/workflows/reusable-tests.yml
 
+  analysis:
+    name: Analysis
+    permissions:
+      contents: read
+      security-events: write
+    uses: ./.github/workflows/reusable-analysis.yml
+
   # ==========================================================================
   # WARNING: This job acts as the required merge gate for this workflow.
   # If you add a new job to this workflow, you MUST add its ID to the 'needs'
@@ -55,7 +62,7 @@ jobs:
   # ==========================================================================
   results:
     name: PR Results
-    needs: [builds, deploys, tests]
+    needs: [analysis, builds, deploys, tests]
     if: always()
     runs-on: ubuntu-slim
     timeout-minutes: 1
diff --git a/.github/workflows/analysis.yml b/.github/workflows/reusable-analysis.yml
similarity index 81%
rename from .github/workflows/analysis.yml
rename to .github/workflows/reusable-analysis.yml
index aff5fcfa3..04d6e12ef 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/reusable-analysis.yml
@@ -1,24 +1,13 @@
-name: Analysis
+name: Reusable Analysis
 
 on:
-  push:
-    branches: [main]
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review, converted_to_draft]
-  schedule:
-    - cron: "0 11 * * 0" # 3 AM PST = 12 PM UDT, runs sundays
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  workflow_call:
 
 permissions: {}
 
 jobs:
   backend-tests:
     name: Backend Tests
-    if: (! github.event.pull_request.draft)
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     services:
@@ -59,7 +48,6 @@ jobs:
 
   frontend-tests:
     name: Frontend Tests
-    if: (! github.event.pull_request.draft)
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     steps:
@@ -86,10 +74,8 @@ jobs:
           supply_scan: true
           triggers: ('frontend/')
 
-  # https://github.com/marketplace/actions/aqua-security-trivy
   trivy:
     name: Trivy Security Scan
-    if: (! github.event.pull_request.draft)
     permissions:
       contents: read
       security-events: write
@@ -102,14 +88,11 @@ jobs:
         uses: actions/cache@v6
         with:
           path: .trivycache
-          key: ${{ runner.os }}-trivy-v0.36.0-cache-v1
+          key: ${{ runner.os }}-trivy-v0.36.0
           restore-keys: |
             ${{ runner.os }}-trivy-
 
-      # Reports every severity to the Security tab for triage.  Findings are not a merge
-      # gate: advisories are published on their own schedule, not the contributor's, and
-      # committed secrets are already blocked at push time by GitHub secret scanning.
-      - name: Run Trivy vulnerability scanner in repo mode
+      - name: Run Trivy Security Scan
         uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
         with:
           format: "sarif"
@@ -124,7 +107,7 @@ jobs:
           exit-code: "0"
 
       - name: Upload Trivy scan results to GitHub Security tab
-        if: always()
+        if: success() || failure()
         uses: github/codeql-action/upload-sarif@v4
         with:
           category: "trivy"
@@ -135,10 +118,10 @@ jobs:
   # If you add a new job to this workflow, you MUST add its ID to the 'needs'
   # array below, otherwise its failure or cancellation will not block the PR!
   # ==========================================================================
-  results:
+  analysis-results:
     name: Analysis Results
     needs: [backend-tests, frontend-tests, trivy]
-    if: always() && (! github.event.pull_request.draft)
+    if: always()
     runs-on: ubuntu-slim
     timeout-minutes: 1
     steps:
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index f05ba9fa5..e9d1dc9c6 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -12,6 +12,13 @@ concurrency:
 permissions: {}
 
 jobs:
+  analysis:
+    name: Analysis
+    permissions:
+      contents: read
+      security-events: write
+    uses: ./.github/workflows/reusable-analysis.yml
+
   stale-branches:
     name: Close Stale Branches & PRs
     runs-on: ubuntu-slim