diff --git a/.github/workflows/debug-artifacts-legacy.yml b/.github/workflows/debug-artifacts-legacy.yml
index 48fe6bd80..2f024964b 100644
--- a/.github/workflows/debug-artifacts-legacy.yml
+++ b/.github/workflows/debug-artifacts-legacy.yml
@@ -24,11 +24,11 @@ jobs:
       fail-fast: false
       matrix:
         version:
-        - stable-v2.13.5
         - stable-v2.14.6
         - stable-v2.15.5
         - stable-v2.16.6
         - stable-v2.17.6
+        - stable-v2.18.4
         - default
         - linked
         - nightly-latest
@@ -73,7 +73,7 @@ jobs:
       - name: Check expected artifacts exist
         shell: bash
         run: |
-          VERSIONS="stable-v2.13.5 stable-v2.14.6 stable-v2.15.5 stable-v2.16.6 stable-v2.17.6 default linked nightly-latest"
+          VERSIONS="stable-v2.14.6 stable-v2.15.5 stable-v2.16.6 stable-v2.17.6 stable-v2.18.4 default linked nightly-latest"
           LANGUAGES="cpp csharp go java javascript python"
           for version in $VERSIONS; do
             pushd "./my-debug-artifacts-${version//./}"
diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml
index 19d11ee2f..cd38ea506 100644
--- a/.github/workflows/debug-artifacts.yml
+++ b/.github/workflows/debug-artifacts.yml
@@ -23,11 +23,11 @@ jobs:
       fail-fast: false
       matrix:
         version:
-        - stable-v2.13.5
         - stable-v2.14.6
         - stable-v2.15.5
         - stable-v2.16.6
         - stable-v2.17.6
+        - stable-v2.18.4
         - default
         - linked
         - nightly-latest
@@ -72,7 +72,7 @@ jobs:
       - name: Check expected artifacts exist
         shell: bash
         run: |
-          VERSIONS="stable-v2.13.5 stable-v2.14.6 stable-v2.15.5 stable-v2.16.6 stable-v2.17.6 default linked nightly-latest"
+          VERSIONS="stable-v2.14.6 stable-v2.15.5 stable-v2.16.6 stable-v2.17.6 stable-v2.18.4 default linked nightly-latest"
           LANGUAGES="cpp csharp go java javascript python"
           for version in $VERSIONS; do
             pushd "./my-debug-artifacts-${version//./}"
diff --git a/lib/codeql.test.js b/lib/codeql.test.js
index b008735d5..e7265609b 100644
--- a/lib/codeql.test.js
+++ b/lib/codeql.test.js
@@ -109,13 +109,13 @@ function mockApiDetails(apiDetails) {
     await util.withTmpDir(async (tmpDir) => {
         (0, testing_utils_1.setupActionsVars)(tmpDir, tmpDir);
         const url = (0, testing_utils_1.mockBundleDownloadApi)({
-            tagName: `codeql-bundle-v2.14.0`,
+            tagName: `codeql-bundle-v2.15.0`,
             isPinned: false,
         });
         const result = await codeql.setupCodeQL(url, testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, tmpDir, util.GitHubVariant.DOTCOM, testing_utils_1.SAMPLE_DEFAULT_CLI_VERSION, (0, testing_utils_1.createFeatures)([]), (0, logging_1.getRunnerLogger)(true), false);
         t.is(toolcache.findAllVersions("CodeQL").length, 1);
-        t.assert(toolcache.find("CodeQL", `2.14.0`));
-        t.is(result.toolsVersion, `2.14.0`);
+        t.assert(toolcache.find("CodeQL", `2.15.0`));
+        t.is(result.toolsVersion, `2.15.0`);
         t.is(result.toolsSource, setup_codeql_1.ToolsSource.Download);
         if (result.toolsDownloadStatusReport) {
             assertDurationsInteger(t, result.toolsDownloadStatusReport);
@@ -265,7 +265,7 @@ for (const toolcacheVersion of [
         mockApiDetails(testing_utils_1.SAMPLE_DOTCOM_API_DETAILS);
         sinon.stub(actionsUtil, "isRunningLocalAction").returns(true);
         const releasesApiMock = mockReleaseApi({
-            assetNames: ["cli-version-2.13.5.txt"],
+            assetNames: ["cli-version-2.14.6.txt"],
             tagName: "codeql-bundle-20230203",
         });
         (0, testing_utils_1.mockBundleDownloadApi)({
diff --git a/src/codeql.test.ts b/src/codeql.test.ts
index a43deba7f..7f6d49f42 100644
--- a/src/codeql.test.ts
+++ b/src/codeql.test.ts
@@ -149,7 +149,7 @@ test("caches semantically versioned bundles using their semantic version number"
   await util.withTmpDir(async (tmpDir) => {
     setupActionsVars(tmpDir, tmpDir);
     const url = mockBundleDownloadApi({
-      tagName: `codeql-bundle-v2.14.0`,
+      tagName: `codeql-bundle-v2.15.0`,
       isPinned: false,
     });
     const result = await codeql.setupCodeQL(
@@ -165,8 +165,8 @@ test("caches semantically versioned bundles using their semantic version number"
     );
 
     t.is(toolcache.findAllVersions("CodeQL").length, 1);
-    t.assert(toolcache.find("CodeQL", `2.14.0`));
-    t.is(result.toolsVersion, `2.14.0`);
+    t.assert(toolcache.find("CodeQL", `2.15.0`));
+    t.is(result.toolsVersion, `2.15.0`);
     t.is(result.toolsSource, ToolsSource.Download);
     if (result.toolsDownloadStatusReport) {
       assertDurationsInteger(t, result.toolsDownloadStatusReport);
@@ -409,7 +409,7 @@ test("bundle URL from another repo is cached as 0.0.0-bundleVersion", async (t)
     mockApiDetails(SAMPLE_DOTCOM_API_DETAILS);
     sinon.stub(actionsUtil, "isRunningLocalAction").returns(true);
     const releasesApiMock = mockReleaseApi({
-      assetNames: ["cli-version-2.13.5.txt"],
+      assetNames: ["cli-version-2.14.6.txt"],
       tagName: "codeql-bundle-20230203",
     });
     mockBundleDownloadApi({