diff --git a/.github/workflows/release.lock.yml b/.github/workflows/release.lock.yml
index e2e41feb4ec..e92c16b34a5 100644
--- a/.github/workflows/release.lock.yml
+++ b/.github/workflows/release.lock.yml
@@ -21,7 +21,7 @@
 #
 # Build, test, and release gh-aw extension, then generate and prepend release highlights
 #
-# frontmatter-hash: c9708bda21d12a9562aa015ec98e9b1e13ed12edc2c85b192f054fa73d025c8b
+# frontmatter-hash: 62a5857122b3a2ff00cac78bc5db9fd961177658cbee4eba8187769c0fd15b7b
 
 name: "Release"
 "on":
@@ -78,7 +78,6 @@ jobs:
   agent:
     needs:
       - activation
-      - changesets
       - config
       - release
     runs-on: ubuntu-latest
@@ -757,6 +756,7 @@ jobs:
   changesets:
     needs:
       - activation
+      - agent
       - config
       - release
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.md b/.github/workflows/release.md
index 2b1791c9f9f..8edfabfc42b 100644
--- a/.github/workflows/release.md
+++ b/.github/workflows/release.md
@@ -303,7 +303,7 @@ jobs:
           provenance: mode=max
 
   changesets:
-    needs: ["activation", "config", "release"]
+    needs: ["activation", "config", "release", "agent"]
     runs-on: ubuntu-latest
     permissions:
       contents: write
diff --git a/scripts/changeset.js b/scripts/changeset.js
index 6734d000438..4b9fec07b66 100755
--- a/scripts/changeset.js
+++ b/scripts/changeset.js
@@ -9,6 +9,10 @@
  *
  * Example:
  *   node changeset.js release v1.2.3 --yes
+ *
+ * Note: This script does NOT create or push git tags. Tags should be created by the caller
+ * (e.g., the GitHub Actions workflow) before running this script. This script only updates
+ * CHANGELOG.md, deletes changeset files, commits the changes, and pushes to the main branch.
  */
 
 const fs = require("fs");
@@ -492,21 +496,13 @@ async function runRelease(versionTag, skipConfirmation = false) {
     console.log(formatInfoMessage("Committing changes..."));
     execSync(`git commit -m "Release ${versionString}"`, { encoding: "utf8" });
 
-    // Create tag
-    console.log(formatInfoMessage("Creating tag..."));
-    execSync(`git tag -a ${versionString} -m "Release ${versionString}"`, { encoding: "utf8" });
-
     // Push commit to remote
     console.log(formatInfoMessage("Pushing commit..."));
     execSync("git push", { encoding: "utf8" });
 
-    // Push tag
-    console.log(formatInfoMessage("Pushing tag..."));
-    execSync(`git push origin ${versionString}`, { encoding: "utf8" });
-
     console.log("");
     console.log(formatSuccessMessage(`Successfully released ${versionString}`));
-    console.log(formatSuccessMessage("Commit and tag pushed to remote"));
+    console.log(formatSuccessMessage("Commit pushed to remote"));
   } catch (error) {
     console.log("");
     console.error(formatErrorMessage("Git operation failed: " + error.message));
@@ -518,9 +514,7 @@ async function runRelease(versionTag, skipConfirmation = false) {
       console.log(`  git add CHANGELOG.md`);
     }
     console.log(`  git commit -m "Release ${versionString}"`);
-    console.log(`  git tag -a ${versionString} -m "Release ${versionString}"`);
     console.log(`  git push`);
-    console.log(`  git push origin ${versionString}`);
     process.exit(1);
   }
 }