diff --git a/.github/workflows/publish-next.yaml b/.github/workflows/publish-next.yaml
deleted file mode 100644
index 7bf0a4b18..000000000
--- a/.github/workflows/publish-next.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Publish Next
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - "src/**"
-      - "tools/cli/**"
-      - "package.json"
-
-concurrency:
-  group: publish-next
-  cancel-in-progress: true
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "npm"
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run tests
-        run: npm test
-
-      - name: Derive next prerelease version
-        run: |
-          NEXT_VER=$(npm view bmad-method@next version 2>/dev/null || echo "")
-          LATEST_VER=$(npm view bmad-method@latest version 2>/dev/null || echo "")
-
-          # Determine the best base version for the next prerelease
-          BASE=$(node -e "
-            const semver = require('semver');
-            const next = process.argv[1] || null;
-            const latest = process.argv[2] || null;
-            if (!next && !latest) process.exit(0);
-            if (!next) { console.log(latest); process.exit(0); }
-            if (!latest) { console.log(next); process.exit(0); }
-            // If latest is newer than next's base, use latest (next prerelease will be based on it)
-            const nextBase = next.replace(/-next\.\d+$/, '');
-            console.log(semver.gt(latest, nextBase) ? latest : next);
-          " "$NEXT_VER" "$LATEST_VER")
-
-          if [ -n "$BASE" ]; then
-            npm version "$BASE" --no-git-tag-version --allow-same-version
-          fi
-          npm version prerelease --preid=next --no-git-tag-version
-
-      - name: Publish to npm
-        run: npm publish --tag next --provenance
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish.yaml
similarity index 52%
rename from .github/workflows/publish-latest.yaml
rename to .github/workflows/publish.yaml
index 6d1c7ed52..3e1dc82e5 100644
--- a/.github/workflows/publish-latest.yaml
+++ b/.github/workflows/publish.yaml
@@ -1,6 +1,12 @@
-name: Publish Latest
+name: Publish
 
 on:
+  push:
+    branches: [main]
+    paths:
+      - "src/**"
+      - "tools/cli/**"
+      - "package.json"
   workflow_dispatch:
     inputs:
       bump:
@@ -14,7 +20,8 @@ on:
           - major
 
 concurrency:
-  group: publish-latest
+  group: publish
+  cancel-in-progress: ${{ github.event_name == 'push' }}
 
 permissions:
   id-token: write
@@ -22,7 +29,7 @@ permissions:
 
 jobs:
   publish:
-    if: github.ref == 'refs/heads/main'
+    if: github.event_name != 'workflow_dispatch' || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -39,6 +46,7 @@ jobs:
           registry-url: "https://registry.npmjs.org"
 
       - name: Configure git user
+        if: github.event_name == 'workflow_dispatch'
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
@@ -49,18 +57,47 @@ jobs:
       - name: Run tests
         run: npm test
 
-      - name: Bump version
+      - name: Derive next prerelease version
+        if: github.event_name == 'push'
+        run: |
+          NEXT_VER=$(npm view bmad-method@next version 2>/dev/null || echo "")
+          LATEST_VER=$(npm view bmad-method@latest version 2>/dev/null || echo "")
+
+          # Determine the best base version for the next prerelease.
+          BASE=$(node -e "
+            const semver = require('semver');
+            const next = process.argv[1] || null;
+            const latest = process.argv[2] || null;
+            if (!next && !latest) process.exit(0);
+            if (!next) { console.log(latest); process.exit(0); }
+            if (!latest) { console.log(next); process.exit(0); }
+            const nextBase = next.replace(/-next\.\d+$/, '');
+            console.log(semver.gt(latest, nextBase) ? latest : next);
+          " "$NEXT_VER" "$LATEST_VER")
+
+          if [ -n "$BASE" ]; then
+            npm version "$BASE" --no-git-tag-version --allow-same-version
+          fi
+          npm version prerelease --preid=next --no-git-tag-version
+
+      - name: Bump stable version
+        if: github.event_name == 'workflow_dispatch'
         run: 'npm version ${{ inputs.bump }} -m "chore(release): v%s [skip ci]"'
 
-      - name: Publish to npm
+      - name: Publish prerelease to npm
+        if: github.event_name == 'push'
+        run: npm publish --tag next --provenance
+
+      - name: Publish stable release to npm
+        if: github.event_name == 'workflow_dispatch'
         run: npm publish --tag latest --provenance
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Push version commit and tag
+        if: github.event_name == 'workflow_dispatch'
         run: git push origin main --follow-tags
 
       - name: Create GitHub Release
+        if: github.event_name == 'workflow_dispatch'
         run: |
           TAG="v$(node -p 'require("./package.json").version')"
           gh release create "$TAG" --generate-notes
@@ -68,6 +105,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Notify Discord
+        if: github.event_name == 'workflow_dispatch'
         continue-on-error: true
         run: |
           set -o pipefail