diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py
index ce5c336d80..0ea816b8a9 100644
--- a/.github/update-release-branch.py
+++ b/.github/update-release-branch.py
@@ -371,10 +371,10 @@ def main():
       # releases.
       run_git('revert', vOlder_update_commits[0], '--no-edit')
 
-      # Also revert the "Update checked-in dependencies" commit created by Actions.
-      update_dependencies_commit = run_git('log', '--grep', '^Update checked-in dependencies', '--format=%H').split()[0]
-      print(f'  Reverting {update_dependencies_commit}')
-      run_git('revert', update_dependencies_commit, '--no-edit')
+      # Also revert the "Rebuild" commit created by Actions.
+      rebuild_commit = run_git('log', '--grep', '^Rebuild$', '--format=%H').split()[0]
+      print(f'  Reverting {rebuild_commit}')
+      run_git('revert', rebuild_commit, '--no-edit')
 
     else:
       print('  Nothing to revert.')
diff --git a/.github/workflows/post-release-mergeback.yml b/.github/workflows/post-release-mergeback.yml
index 03efc0c33a..2c53370446 100644
--- a/.github/workflows/post-release-mergeback.yml
+++ b/.github/workflows/post-release-mergeback.yml
@@ -146,6 +146,7 @@ jobs:
           private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
 
       - name: Create the GitHub release
+        if: steps.check.outputs.exists != 'true'
         env:
           PARTIAL_CHANGELOG: "${{ runner.temp }}/partial_changelog.md"
           VERSION: "${{ steps.getVersion.outputs.version }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca3d59c6eb..776bc0b7a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 No user facing changes.
 
+## 4.30.8 - 10 Oct 2025
+
+No user facing changes.
+
 ## 4.30.7 - 06 Oct 2025
 
 - [v4+ only] The CodeQL Action now runs on Node.js v24. [#3169](https://github.com/github/codeql-action/pull/3169)
diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js
index bdeb7f0086..e015e47117 100644
--- a/lib/analyze-action-post.js
+++ b/lib/analyze-action-post.js
@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index 79ea7886cc..43f4e704ba 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -32309,7 +32309,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js
index 268cca109e..06e298736c 100644
--- a/lib/autobuild-action.js
+++ b/lib/autobuild-action.js
@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/init-action-post.js b/lib/init-action-post.js
index b816da46a4..42985a5d80 100644
--- a/lib/init-action-post.js
+++ b/lib/init-action-post.js
@@ -32309,7 +32309,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/init-action.js b/lib/init-action.js
index c8a5a07903..a113b2728f 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -32309,7 +32309,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js
index 67ca84e633..cb7781d131 100644
--- a/lib/resolve-environment-action.js
+++ b/lib/resolve-environment-action.js
@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js
index 4e3bc7058d..dc690e7744 100644
--- a/lib/start-proxy-action-post.js
+++ b/lib/start-proxy-action-post.js
@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js
index 6d3712bb36..7815851ee8 100644
--- a/lib/start-proxy-action.js
+++ b/lib/start-proxy-action.js
@@ -44996,7 +44996,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
index d4bcd84035..a3c6a39532 100644
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -33606,7 +33606,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js
index 64f1c69f20..ce6944d1ee 100644
--- a/lib/upload-sarif-action-post.js
+++ b/lib/upload-sarif-action-post.js
@@ -26460,7 +26460,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js
index 1572ada22a..ec452b2ec0 100644
--- a/lib/upload-sarif-action.js
+++ b/lib/upload-sarif-action.js
@@ -32309,7 +32309,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.8",
+      version: "4.30.9",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/package-lock.json b/package-lock.json
index ccb4f9ad53..2c31324a70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "4.30.8",
+  "version": "4.30.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "4.30.8",
+      "version": "4.30.9",
       "license": "MIT",
       "dependencies": {
         "@actions/artifact": "^2.3.1",
diff --git a/package.json b/package.json
index b8ddcc205f..8180650a46 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "4.30.8",
+  "version": "4.30.9",
   "private": true,
   "description": "CodeQL action",
   "scripts": {