diff --git a/.github/workflows/gatekeeper.yml b/.github/workflows/gatekeeper.yml
index cfa2e7c..ec187f3 100644
--- a/.github/workflows/gatekeeper.yml
+++ b/.github/workflows/gatekeeper.yml
@@ -9,7 +9,7 @@ on:
 
 concurrency:
   group: ci-gatekeeper-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   changes:
@@ -77,6 +77,27 @@ jobs:
               - '.github/workflows/publish.yml'
               - '.github/workflows/gatekeeper.yml'
 
+  detect-publishable:
+    name: Detect publishable release
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    outputs:
+      should_publish: ${{ steps.detect.outputs.should_publish }}
+      packages_json: ${{ steps.detect.outputs.packages_json }}
+      summary_markdown: ${{ steps.detect.outputs.summary_markdown }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      - name: Detect publishable packages
+        id: detect
+        run: node .github/scripts/detect-publishable.mjs
+
   changesets:
     name: Changeset Check
     if: github.event_name == 'pull_request' && !startsWith(github.head_ref, 'changeset-release/') && needs.changes.outputs.publish-surface == 'true'
@@ -122,17 +143,49 @@ jobs:
     secrets: inherit
 
   agw-client:
-    needs: changes
-    if: github.event_name == 'workflow_dispatch' || needs.changes.outputs.agw-client == 'true'
+    needs:
+      - changes
+      - detect-publishable
+    if: |
+      always() &&
+      needs.changes.result == 'success' &&
+      (github.event_name == 'workflow_dispatch' ||
+        needs.changes.outputs.agw-client == 'true' ||
+        needs.detect-publishable.outputs.should_publish == 'true')
     uses: ./.github/workflows/ci-agw-client.yml
     secrets: inherit
 
   release-surface:
-    needs: changes
-    if: github.event_name == 'workflow_dispatch' || needs.changes.outputs.publish-surface == 'true'
+    needs:
+      - changes
+      - detect-publishable
+    if: |
+      always() &&
+      needs.changes.result == 'success' &&
+      (github.event_name == 'workflow_dispatch' ||
+        needs.changes.outputs.publish-surface == 'true' ||
+        needs.detect-publishable.outputs.should_publish == 'true')
     uses: ./.github/workflows/ci-release-surface.yml
     secrets: inherit
 
+  publish:
+    name: Publish
+    needs:
+      - detect-publishable
+      - release-surface
+      - agw-client
+    if: |
+      github.event_name == 'push' &&
+      github.ref == 'refs/heads/main' &&
+      needs.detect-publishable.outputs.should_publish == 'true' &&
+      needs.release-surface.result == 'success' &&
+      needs.agw-client.result == 'success'
+    permissions:
+      contents: read
+      id-token: write
+    uses: ./.github/workflows/publish.yml
+    secrets: inherit
+
   ci-gatekeeper:
     name: CI Gatekeeper
     runs-on: ubuntu-latest
@@ -143,11 +196,13 @@ jobs:
       - contracts
       - agw-client
       - release-surface
+      - detect-publishable
+      - publish
     steps:
       - name: Verify job results
         run: |
           set -euo pipefail
-          results="${{ needs.changesets.result || 'skipped' }} ${{ needs.verify.result || 'skipped' }} ${{ needs.contracts.result || 'skipped' }} ${{ needs.agw-client.result || 'skipped' }} ${{ needs.release-surface.result || 'skipped' }}"
+          results="${{ needs.changesets.result || 'skipped' }} ${{ needs.verify.result || 'skipped' }} ${{ needs.contracts.result || 'skipped' }} ${{ needs.agw-client.result || 'skipped' }} ${{ needs.release-surface.result || 'skipped' }} ${{ needs.detect-publishable.result || 'skipped' }} ${{ needs.publish.result || 'skipped' }}"
           echo "Job results: $results"
 
           if [[ "$results" =~ failure || "$results" =~ cancelled ]]; then
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1d6df66..fa83ca2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,65 +1,22 @@
 name: Publish
 
 on:
-  push:
-    branches:
-      - main
+  workflow_call:
 
 permissions:
   contents: read
+  id-token: write
 
 concurrency:
   group: publish-${{ github.ref }}
   cancel-in-progress: false
 
 jobs:
-  detect:
-    name: Detect publishable release
-    runs-on: ubuntu-latest
-    outputs:
-      should_publish: ${{ steps.detect.outputs.should_publish }}
-      packages_json: ${{ steps.detect.outputs.packages_json }}
-      summary_markdown: ${{ steps.detect.outputs.summary_markdown }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 24
-
-      - name: Detect publishable packages
-        id: detect
-        run: node .github/scripts/detect-publishable.mjs
-
-  verify-release-surface:
-    name: Verify release surface
-    needs: detect
-    if: needs.detect.outputs.should_publish == 'true'
-    uses: ./.github/workflows/ci-release-surface.yml
-    secrets: inherit
-
-  verify-agw-client:
-    name: Verify AGW client
-    needs: detect
-    if: needs.detect.outputs.should_publish == 'true'
-    uses: ./.github/workflows/ci-agw-client.yml
-    secrets: inherit
-
   publish:
     name: Publish to npm
-    needs:
-      - detect
-      - verify-release-surface
-      - verify-agw-client
-    if: needs.detect.outputs.should_publish == 'true'
     runs-on: ubuntu-latest
     environment:
       name: npm
-    permissions:
-      contents: read
-      id-token: write
     env:
       NPM_CONFIG_PROVENANCE: "true"
       NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}