diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35c51c548b..c486f297fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
 ## [UNRELEASED]
 
 - Improve the reliability and performance of analyzing code when analyzing a compiled language with the `autobuild` [build mode](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#codeql-build-modes) on GitHub Enterprise Server. This feature is already available to GitHub.com users. [#2353](https://github.com/github/codeql-action/pull/2353)
+- Update default CodeQL bundle version to 2.18.0. [#2364](https://github.com/github/codeql-action/pull/2364)
 
 ## 3.25.11 - 28 Jun 2024
 
diff --git a/lib/defaults.json b/lib/defaults.json
index 30e15988df..ca73cdd44a 100644
--- a/lib/defaults.json
+++ b/lib/defaults.json
@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.17.6",
-    "cliVersion": "2.17.6",
-    "priorBundleVersion": "codeql-bundle-v2.17.5",
-    "priorCliVersion": "2.17.5"
+    "bundleVersion": "codeql-bundle-v2.18.0",
+    "cliVersion": "2.18.0",
+    "priorBundleVersion": "codeql-bundle-v2.17.6",
+    "priorCliVersion": "2.17.6"
 }
diff --git a/src/defaults.json b/src/defaults.json
index c4e805d98a..a213828b40 100644
--- a/src/defaults.json
+++ b/src/defaults.json
@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.17.6",
-  "cliVersion": "2.17.6",
-  "priorBundleVersion": "codeql-bundle-v2.17.5",
-  "priorCliVersion": "2.17.5"
+  "bundleVersion": "codeql-bundle-v2.18.0",
+  "cliVersion": "2.18.0",
+  "priorBundleVersion": "codeql-bundle-v2.17.6",
+  "priorCliVersion": "2.17.6"
 }