diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffbf26d63..a1c238a0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+## v2.21.1 - 2025-10-28
+
+- Update CSA version to 25.10.0-1399 
+
 ## v2.21.0 - 2025-10-22
 
 ### General
diff --git a/README.md b/README.md
index 7a68a1b5a..662789b9f 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ see [Migrate from the SignalFx Java Agent](https://help.splunk.com/en/splunk-obs
 <!-- Comments, spacing, empty and new lines in the section below are intentional, please do not modify them! -->
 <!--DEV_DOCS_WARNING-->
 <!--DEV_DOCS_WARNING_START-->
-The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v2.21.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.21.0/README.md).
+The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v2.21.1](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.21.1/README.md).
 
 ---
 <!--DEV_DOCS_WARNING_END-->
@@ -112,7 +112,7 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
 you have to use a compatible API version.
 
 <!-- IMPORTANT: do not change comments or break those lines below -->
-The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.21.0<!--SPLUNK_VERSION--> is compatible
+The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.21.1<!--SPLUNK_VERSION--> is compatible
 with:
 
 * OpenTelemetry API version <!--OTEL_VERSION-->1.55.0<!--OTEL_VERSION-->
diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md
index 0e521d405..5a1c637c1 100644
--- a/deployments/cloudfoundry/buildpack/README.md
+++ b/deployments/cloudfoundry/buildpack/README.md
@@ -40,7 +40,7 @@ If you want to use a specific version of the Java agent in your application, you
 environment variable before application deployment, either using `cf set-env` or the `manifest.yml` file:
 
 ```sh
-$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.21.0
+$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.21.1
 ```
 
 By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.
diff --git a/deployments/cloudfoundry/index.yml b/deployments/cloudfoundry/index.yml
index f36a1eb96..eeb971236 100644
--- a/deployments/cloudfoundry/index.yml
+++ b/deployments/cloudfoundry/index.yml
@@ -48,3 +48,4 @@
 2.19.0: https://github.com/signalfx/splunk-otel-java/releases/download/v2.19.0/splunk-otel-javaagent.jar
 2.20.0: https://github.com/signalfx/splunk-otel-java/releases/download/v2.20.0/splunk-otel-javaagent.jar
 2.21.0: https://github.com/signalfx/splunk-otel-java/releases/download/v2.21.0/splunk-otel-javaagent.jar
+2.21.1: https://github.com/signalfx/splunk-otel-java/releases/download/v2.21.1/splunk-otel-javaagent.jar