diff --git a/.github/workflows/polish-release-notes.yml b/.github/workflows/polish-release-notes.yml
index cd77c20a..49e2bff8 100644
--- a/.github/workflows/polish-release-notes.yml
+++ b/.github/workflows/polish-release-notes.yml
@@ -1,14 +1,8 @@
 name: Polish Release Notes
 
-# Automatically polish release notes when a release is published.
-# Also supports manual trigger as a fallback.
-#
-# Note: The Claude Code Action works with any GitHub event when using the
-# `prompt` parameter for custom automations. If release triggers stop working,
-# check https://github.com/anthropics/claude-code-action for updates.
+# Uses Claude to transform raw changelog into polished release notes.
+# Triggered automatically by release-prepare after publishing, or manually.
 on:
-  release:
-    types: [published]
   workflow_dispatch:
     inputs:
       tag_name:
@@ -17,7 +11,7 @@ on:
         type: string
 
 env:
-  TAG_NAME: ${{ github.event.release.tag_name || inputs.tag_name }}
+  TAG_NAME: ${{ inputs.tag_name }}
 
 permissions:
   contents: write
diff --git a/.github/workflows/release-prepare.yml b/.github/workflows/release-prepare.yml
index beb0eba6..5e81c9f5 100644
--- a/.github/workflows/release-prepare.yml
+++ b/.github/workflows/release-prepare.yml
@@ -47,6 +47,7 @@ jobs:
 
       # Opens/updates the Version Packages PR; publishes when the Version PR merges
       - name: Create/Update Version PR
+        id: changesets
         uses: changesets/action@v1
         with:
           title: 'chore(release): version packages'
@@ -57,3 +58,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
           # npm authentication handled via OIDC trusted publishing (no token needed)
+
+      # Trigger release notes polishing after a release is published
+      - name: Polish release notes
+        if: steps.changesets.outputs.published == 'true'
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+          # Get version from package.json (just bumped by changesets)
+          TAG="v$(jq -r .version package.json)"
+          echo "Triggering polish workflow for $TAG"
+          gh workflow run polish-release-notes.yml -f tag_name="$TAG"