diff --git a/CHANGELOG.md b/CHANGELOG.md
index 517909e9e3..ea97fa176a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ No user facing changes.
 
 - We are rolling out a feature in April/May 2024 that improves 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). [#2235](https://github.com/github/codeql-action/pull/2235)
 - Fix a bug where the `init` Action would fail if `--overwrite` was specified in `CODEQL_ACTION_EXTRA_OPTIONS`. [#2245](https://github.com/github/codeql-action/pull/2245)
+- Update default CodeQL bundle version to 2.17.1. [#2247](https://github.com/github/codeql-action/pull/2247)
 
 ## 3.25.0 - 15 Apr 2024
 
diff --git a/lib/defaults.json b/lib/defaults.json
index 044c1abada..6e2b18b1d6 100644
--- a/lib/defaults.json
+++ b/lib/defaults.json
@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.17.0",
-    "cliVersion": "2.17.0",
-    "priorBundleVersion": "codeql-bundle-v2.16.5",
-    "priorCliVersion": "2.16.5"
+    "bundleVersion": "codeql-bundle-v2.17.1",
+    "cliVersion": "2.17.1",
+    "priorBundleVersion": "codeql-bundle-v2.17.0",
+    "priorCliVersion": "2.17.0"
 }
diff --git a/src/defaults.json b/src/defaults.json
index c318f7890e..d46846f8d9 100644
--- a/src/defaults.json
+++ b/src/defaults.json
@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.17.0",
-  "cliVersion": "2.17.0",
-  "priorBundleVersion": "codeql-bundle-v2.16.5",
-  "priorCliVersion": "2.16.5"
+  "bundleVersion": "codeql-bundle-v2.17.1",
+  "cliVersion": "2.17.1",
+  "priorBundleVersion": "codeql-bundle-v2.17.0",
+  "priorCliVersion": "2.17.0"
 }