diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b7ef97fb2..ea4277b43b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,19 @@ refer to the [commit
 history](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commits/main)
 on GitHub.
 
+## [3.8.5](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v3.8.4...v3.8.5) (2024-06-24)
+
+
+### Dependencies
+
+* bump cloud-sql-socket-factory.version from 1.18.0 to 1.19.0 ([#2968](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2968)) ([6c09fe0](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/6c09fe0514b64c5d171e141974a4d0f4fb0f0122))
+* bump com.google.cloud:libraries-bom from 26.40.0 to 26.42.0 ([#2973](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2973)) ([b139323](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/b139323f4b91ea092766c448a2f9b382519010f3))
+* bump com.google.errorprone:error_prone_core from 2.27.1 to 2.28.0 ([#2957](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2957)) ([e611602](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/e611602227a3a6a612692b6e612db33f253e67ac))
+* bump org.apache.maven.plugins:maven-checkstyle-plugin ([#2965](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2965)) ([4cecb24](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/4cecb24d73dea81b723a1744241155bab6cce1bd))
+* bump org.apache.maven.plugins:maven-enforcer-plugin ([#2941](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2941)) ([05fd497](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/05fd497327862eee7b3e33b103e84126f22c356b))
+* bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 ([#2974](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2974)) ([b59f775](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/b59f77529016eee8386c3db4c0583f370b39b62b))
+* bump org.apache.maven.plugins:maven-javadoc-plugin ([#2958](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2958)) ([b4371b9](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/b4371b92cbc73709c437b0ae556eb8e2ed31f0ff))
+
 ## [3.8.4](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v3.8.3...v3.8.4) (2024-05-29)
 
 
diff --git a/README.adoc b/README.adoc
index 39cfeb9c6c..8b3956aa44 100644
--- a/README.adoc
+++ b/README.adoc
@@ -11,7 +11,7 @@ You can check our project website https://spring.io/projects/spring-cloud-gcp[he
 For a deep dive into the project, refer to the Spring Framework on Google Cloud Reference documentation or Javadocs:
 
 // {x-version-update-start:spring-cloud-gcp:released}
-* link:https://googlecloudplatform.github.io/spring-cloud-gcp/3.8.4/reference/html/index.html[Spring Framework on Google Cloud 3.7.4] - https://googleapis.dev/java/spring-cloud-gcp/3.7.4/index.html[Javadocs 3.7.4]
+* link:https://googlecloudplatform.github.io/spring-cloud-gcp/3.8.5/reference/html/index.html[Spring Framework on Google Cloud 3.7.4] - https://googleapis.dev/java/spring-cloud-gcp/3.7.4/index.html[Javadocs 3.7.4]
 // {x-version-update-end}
 
 If you prefer to learn by doing, try taking a look at the https://github.com/GoogleCloudPlatform/spring-cloud-gcp/tree/main/spring-cloud-gcp-samples[Spring Framework on Google Cloud sample applications] or the https://codelabs.developers.google.com/spring[Spring on Google Cloud codelabs].
@@ -79,7 +79,7 @@ This will allow you to not specify versions for any of the Maven dependencies an
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>spring-cloud-gcp-dependencies</artifactId>
-            <version>3.8.4</version>
+            <version>3.8.5</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
diff --git a/docs/pom.xml b/docs/pom.xml
index 147265bdca..d45c0b443d 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Framework on Google Cloud Documentation</name>
 	<groupId>com.google.cloud</groupId>
 	<artifactId>spring-cloud-gcp-docs</artifactId>
-	<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/pom.xml b/pom.xml
index d913781bae..c0720266dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.google.cloud</groupId>
 	<artifactId>spring-cloud-gcp</artifactId>
-	<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 
 	<name>Spring Framework on Google Cloud</name>
 	<description>Spring Framework on Google Cloud</description>
diff --git a/spring-cloud-gcp-autoconfigure/pom.xml b/spring-cloud-gcp-autoconfigure/pom.xml
index fdab969f40..859a6b9fab 100644
--- a/spring-cloud-gcp-autoconfigure/pom.xml
+++ b/spring-cloud-gcp-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-bigquery/pom.xml b/spring-cloud-gcp-bigquery/pom.xml
index da245d02bd..6f27880fef 100644
--- a/spring-cloud-gcp-bigquery/pom.xml
+++ b/spring-cloud-gcp-bigquery/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
 
   <artifactId>spring-cloud-gcp-bigquery</artifactId>
diff --git a/spring-cloud-gcp-cloudfoundry/pom.xml b/spring-cloud-gcp-cloudfoundry/pom.xml
index 2d3ab1c55c..9f03a2cb6d 100644
--- a/spring-cloud-gcp-cloudfoundry/pom.xml
+++ b/spring-cloud-gcp-cloudfoundry/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <artifactId>spring-cloud-gcp-cloudfoundry</artifactId>
diff --git a/spring-cloud-gcp-core/pom.xml b/spring-cloud-gcp-core/pom.xml
index 6e6008f967..c31162f84b 100644
--- a/spring-cloud-gcp-core/pom.xml
+++ b/spring-cloud-gcp-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<artifactId>spring-cloud-gcp-core</artifactId>
diff --git a/spring-cloud-gcp-data-datastore/pom.xml b/spring-cloud-gcp-data-datastore/pom.xml
index ac5952b28e..715a07c850 100644
--- a/spring-cloud-gcp-data-datastore/pom.xml
+++ b/spring-cloud-gcp-data-datastore/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <groupId>com.google.cloud</groupId>
   <artifactId>spring-cloud-gcp-data-datastore</artifactId>
diff --git a/spring-cloud-gcp-data-firestore/pom.xml b/spring-cloud-gcp-data-firestore/pom.xml
index d0060207ae..5ffe524e03 100644
--- a/spring-cloud-gcp-data-firestore/pom.xml
+++ b/spring-cloud-gcp-data-firestore/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <artifactId>spring-cloud-gcp-data-firestore</artifactId>
diff --git a/spring-cloud-gcp-data-spanner/pom.xml b/spring-cloud-gcp-data-spanner/pom.xml
index 18c6d89f99..7f933ee244 100644
--- a/spring-cloud-gcp-data-spanner/pom.xml
+++ b/spring-cloud-gcp-data-spanner/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<groupId>com.google.cloud</groupId>
 	<artifactId>spring-cloud-gcp-data-spanner</artifactId>
diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml
index 02fbbb25a6..0393c88b37 100644
--- a/spring-cloud-gcp-dependencies/pom.xml
+++ b/spring-cloud-gcp-dependencies/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>com.google.cloud</groupId>
 	<artifactId>spring-cloud-gcp-dependencies</artifactId>
-	<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 
 	<name>Spring Framework on Google Cloud Dependencies</name>
 	<description>Spring Framework on Google Cloud Dependencies</description>
diff --git a/spring-cloud-gcp-kms/pom.xml b/spring-cloud-gcp-kms/pom.xml
index d2c8b05c8e..770c642a6c 100644
--- a/spring-cloud-gcp-kms/pom.xml
+++ b/spring-cloud-gcp-kms/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-logging/pom.xml b/spring-cloud-gcp-logging/pom.xml
index 22d186f64c..f7b324b204 100644
--- a/spring-cloud-gcp-logging/pom.xml
+++ b/spring-cloud-gcp-logging/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<properties>
diff --git a/spring-cloud-gcp-native-support/pom.xml b/spring-cloud-gcp-native-support/pom.xml
index 00898865c5..0fb19af7ec 100644
--- a/spring-cloud-gcp-native-support/pom.xml
+++ b/spring-cloud-gcp-native-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-pubsub-stream-binder/pom.xml b/spring-cloud-gcp-pubsub-stream-binder/pom.xml
index 4a3e9081b2..ebe81e05fa 100644
--- a/spring-cloud-gcp-pubsub-stream-binder/pom.xml
+++ b/spring-cloud-gcp-pubsub-stream-binder/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-pubsub/pom.xml b/spring-cloud-gcp-pubsub/pom.xml
index 79c1bab147..6404092cee 100644
--- a/spring-cloud-gcp-pubsub/pom.xml
+++ b/spring-cloud-gcp-pubsub/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<artifactId>spring-cloud-gcp-pubsub</artifactId>
diff --git a/spring-cloud-gcp-samples/pom.xml b/spring-cloud-gcp-samples/pom.xml
index 326248c379..ee1500939a 100644
--- a/spring-cloud-gcp-samples/pom.xml
+++ b/spring-cloud-gcp-samples/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Framework on Google Cloud Code Samples</name>
 	<artifactId>spring-cloud-gcp-samples</artifactId>
 	<groupId>com.google.cloud</groupId>
-	<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 
 	<packaging>pom</packaging>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-bigquery-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-bigquery-sample/pom.xml
index 1821db5a86..0d7468ae6a 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-bigquery-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-bigquery-sample/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-config-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-config-sample/pom.xml
index 95e78d4e8c..8e9c3fe090 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-config-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-config-sample/pom.xml
@@ -7,7 +7,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-basic-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-basic-sample/pom.xml
index 71eb6d8d7b..9e9f639f48 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-basic-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-basic-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-sample/pom.xml
index 0411051ff9..c9d9e5049b 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml
index dedcf25fcd..f997fbe415 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-samples</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-jpa-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-jpa-sample/pom.xml
index 3340471d40..91545a92a6 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-jpa-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-jpa-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-multi-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-multi-sample/pom.xml
index dbded4e55a..5a1c95719f 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-multi-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-multi-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-repository-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-repository-sample/pom.xml
index 7b4e335e5a..42f436afdf 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-repository-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-repository-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-template-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-template-sample/pom.xml
index e070772cb3..21f2b44258 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-template-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-template-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-firestore-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-firestore-sample/pom.xml
index 52e47c2261..fece7e3f47 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-firestore-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-firestore-sample/pom.xml
@@ -7,7 +7,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-json-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-json-sample/pom.xml
index d01652fe82..bd2022a139 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-json-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-json-sample/pom.xml
@@ -7,7 +7,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/pom.xml
index b0e110770b..c2d525456a 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-polling-receiver/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-polling-receiver/pom.xml
index e59a0ff2fc..c9894033d6 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-polling-receiver/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-polling-receiver/pom.xml
@@ -7,7 +7,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-receiver/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-receiver/pom.xml
index d3e9d4dcea..2828519a42 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-receiver/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-receiver/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-sender/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-sender/pom.xml
index df4f0fff3b..73c2d6eb66 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-sender/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-sender/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-test/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-test/pom.xml
index e4786f9b3e..50fbf3b1da 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-test/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-test/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-storage-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-storage-sample/pom.xml
index bb86fed45d..c9d6e86060 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-storage-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-storage-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-kms-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-kms-sample/pom.xml
index 3dcee0a029..0d5939aa1f 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-kms-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-kms-sample/pom.xml
@@ -7,7 +7,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/pom.xml
index fbdb804a7e..7511d5c75b 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/pom.xml
@@ -7,12 +7,12 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<groupId>com.google.cloud</groupId>
 	<artifactId>spring-cloud-gcp-kotlin-samples</artifactId>
-	<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 
 	<name>Spring Framework on Google Cloud Code Samples - Kotlin</name>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/spring-cloud-gcp-kotlin-app-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/spring-cloud-gcp-kotlin-app-sample/pom.xml
index 7ebf0faf99..c1ad934815 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/spring-cloud-gcp-kotlin-app-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/spring-cloud-gcp-kotlin-app-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-kotlin-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/pom.xml
index a7e1412e48..d43d6f5110 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/pom.xml
@@ -11,7 +11,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <!-- The Spring Framework on Google Cloud BOM will manage spring-cloud-gcp version numbers for you. -->
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-metrics-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-metrics-sample/pom.xml
index fde4c190e4..3ba64103d1 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-metrics-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-metrics-sample/pom.xml
@@ -11,7 +11,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <!-- The Spring Framework on Google Cloud BOM will manage spring-cloud-gcp version numbers for you. -->
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml
index 73f7d83a57..f87eca809e 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-client/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-client/pom.xml
index e0f45015ee..61780f566f 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-client/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-client/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-bus-config-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-github/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-github/pom.xml
index f34e2b5dfd..fe65c26dda 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-github/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-github/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-bus-config-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-local/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-local/pom.xml
index 8038d96d0a..7fe6a777fb 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-local/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-local/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-bus-config-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-test/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-test/pom.xml
index 60f5ce24ea..b805c62952 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-test/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-test/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-bus-config-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-reactive-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-reactive-sample/pom.xml
index ba70402fb3..34fa2fff32 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-reactive-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-reactive-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-sample/pom.xml
index be28462dea..d4822b4f2c 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-sample/pom.xml
@@ -7,7 +7,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-dead-letter-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-dead-letter-sample/pom.xml
index 80dc820e73..a4d4ba98cf 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-dead-letter-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-dead-letter-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/pom.xml
index a1aafafe2a..091bf496b5 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp-samples</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-sink/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-sink/pom.xml
index 06311bf074..b68405711a 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-sink/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-sink/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-stream-functional-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-source/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-source/pom.xml
index 9f3c08b929..f4aa673ba7 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-source/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-source/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp-pubsub-stream-functional-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-test/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-test/pom.xml
index da9d9c2ff0..8a9ab6bbca 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-test/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp-pubsub-stream-functional-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-polling-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-polling-sample/pom.xml
index 0d1a490349..264a4ef771 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-polling-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-polling-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-sample/pom.xml
index 833e1b0ca0..dad84c7a86 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-secretmanager-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-secretmanager-sample/pom.xml
index 19a45d626d..8ff22b2868 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-secretmanager-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-secretmanager-sample/pom.xml
@@ -7,7 +7,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-samples</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-security-firebase-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-security-firebase-sample/pom.xml
index d66a236e49..8fe0e10912 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-security-firebase-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-security-firebase-sample/pom.xml
@@ -7,7 +7,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <properties>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-security-iap-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-security-iap-sample/pom.xml
index 2b0f26d2da..4d00db2ff6 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-security-iap-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-security-iap-sample/pom.xml
@@ -12,7 +12,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <properties>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-r2dbc-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-r2dbc-sample/pom.xml
index 44dfc1737d..2cd088c124 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-r2dbc-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-r2dbc-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-sample/pom.xml
index 04b767a04b..bbee70ade0 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-r2dbc-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-r2dbc-sample/pom.xml
index 7e9d28901b..f7dd55391e 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-r2dbc-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-r2dbc-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-sample/pom.xml
index 008235bba3..4681e4d00f 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-storage-resource-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-storage-resource-sample/pom.xml
index 76579b9182..1e1f3f397a 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-storage-resource-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-storage-resource-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/pom.xml
index c4a77db403..d764158d6e 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/pom.xml
@@ -11,7 +11,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <!-- The Spring Framework on Google Cloud BOM will manage spring-cloud-gcp version numbers for you. -->
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-vision-api-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-vision-api-sample/pom.xml
index 160741d4c5..a9f8a3b64c 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-vision-api-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-vision-api-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/pom.xml
index 8b4473ec95..ce92777f72 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-spanner-r2dbc-samples/pom.xml b/spring-cloud-gcp-samples/spring-cloud-spanner-r2dbc-samples/pom.xml
index 0ffdd39309..0241b9f5d1 100644
--- a/spring-cloud-gcp-samples/spring-cloud-spanner-r2dbc-samples/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-spanner-r2dbc-samples/pom.xml
@@ -7,7 +7,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-samples</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-secretmanager/pom.xml b/spring-cloud-gcp-secretmanager/pom.xml
index 827bb35e51..3e54f85f03 100644
--- a/spring-cloud-gcp-secretmanager/pom.xml
+++ b/spring-cloud-gcp-secretmanager/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-security-firebase/pom.xml b/spring-cloud-gcp-security-firebase/pom.xml
index 45a6f2979c..ae7c75d99f 100644
--- a/spring-cloud-gcp-security-firebase/pom.xml
+++ b/spring-cloud-gcp-security-firebase/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
 
diff --git a/spring-cloud-gcp-security-iap/pom.xml b/spring-cloud-gcp-security-iap/pom.xml
index db94467c58..9b257ab9db 100644
--- a/spring-cloud-gcp-security-iap/pom.xml
+++ b/spring-cloud-gcp-security-iap/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<artifactId>spring-cloud-gcp-security-iap</artifactId>
diff --git a/spring-cloud-gcp-starters/pom.xml b/spring-cloud-gcp-starters/pom.xml
index 082c025427..5d12d9b389 100644
--- a/spring-cloud-gcp-starters/pom.xml
+++ b/spring-cloud-gcp-starters/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<packaging>pom</packaging>
 	<name>Spring Framework on Google Cloud Starters</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bigquery/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bigquery/pom.xml
index 28fdb25232..ab8245085b 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bigquery/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bigquery/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp-starters</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bus-pubsub/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bus-pubsub/pom.xml
index 3efa2d2f35..747bd9a404 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bus-pubsub/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bus-pubsub/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
 
   <artifactId>spring-cloud-gcp-starter-bus-pubsub</artifactId>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-cloudfoundry/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-cloudfoundry/pom.xml
index 46a27c8fb5..00714e8b81 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-cloudfoundry/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-cloudfoundry/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-config/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-config/pom.xml
index ad9c9b63b5..d966c8e23d 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-config/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-config/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-config</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Config</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-datastore/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-datastore/pom.xml
index 309094053a..61886e42e0 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-datastore/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-datastore/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-data-datastore</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Datastore</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-firestore/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-firestore/pom.xml
index c8aee3d629..c88bf0361e 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-firestore/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-firestore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>spring-cloud-gcp-starters</artifactId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <artifactId>spring-cloud-gcp-starter-data-firestore</artifactId>
     <name>Spring Framework on Google Cloud Starter - Firestore</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-spanner/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-spanner/pom.xml
index 22df381fe5..3d7b78bc38 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-spanner/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-spanner/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-data-spanner</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Spanner</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml
index e7806d1979..4dc07794f9 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-firestore</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Firestore</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-kms/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-kms/pom.xml
index 38826687f0..e9a37ccde3 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-kms/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-kms/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-logging/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-logging/pom.xml
index 89cb6aae6f..93945ff42a 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-logging/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-logging/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml
index af281af9a5..8ce0b89ab3 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-pubsub/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-pubsub/pom.xml
index f817a03f0e..90af54c005 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-pubsub/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-pubsub/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-pubsub</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Pub/Sub</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager/pom.xml
index a8e8c23401..56766cc92d 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase/pom.xml
index 6e6350d911..1b29211f47 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap/pom.xml
index 15cee287c3..ae108dce3e 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql-r2dbc/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql-r2dbc/pom.xml
index 0202acc50a..2c7764490a 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql-r2dbc/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql-r2dbc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml
index 1331ac7d3a..1095f5ac33 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml
index f98a079f54..3d8d0e7278 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml
index de04bbb70a..25fd770c2b 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage/pom.xml
index e901b927be..ba593d3d12 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-storage</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Storage</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml
index f511f2cdaa..93de8a349c 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-vision/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-vision/pom.xml
index 12993efc40..5ee5d5afb2 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-vision/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-vision/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter/pom.xml
index 58814446b6..a979969a22 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Support</name>
diff --git a/spring-cloud-gcp-storage/pom.xml b/spring-cloud-gcp-storage/pom.xml
index ad9b592b09..6e9c2f274e 100644
--- a/spring-cloud-gcp-storage/pom.xml
+++ b/spring-cloud-gcp-storage/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-storage</artifactId>
 	<name>Spring Framework on Google Cloud Module - Storage</name>
diff --git a/spring-cloud-gcp-vision/pom.xml b/spring-cloud-gcp-vision/pom.xml
index 9f5e25eee1..2cab3ecaf9 100644
--- a/spring-cloud-gcp-vision/pom.xml
+++ b/spring-cloud-gcp-vision/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-spanner-spring-data-r2dbc/pom.xml b/spring-cloud-spanner-spring-data-r2dbc/pom.xml
index 8a2336677c..161904a669 100644
--- a/spring-cloud-spanner-spring-data-r2dbc/pom.xml
+++ b/spring-cloud-spanner-spring-data-r2dbc/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>3.8.5-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>3.8.5</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/versions.txt b/versions.txt
index ef2a199c57..9a5608e9b2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-spring-cloud-gcp:3.8.4:3.8.5-SNAPSHOT
\ No newline at end of file
+spring-cloud-gcp:3.8.5:3.8.5
\ No newline at end of file