diff --git a/.github/workflows/unmanaged-dependency-check.yaml b/.github/workflows/unmanaged-dependency-check.yaml
index 253e6980b5..894c12518b 100644
--- a/.github/workflows/unmanaged-dependency-check.yaml
+++ b/.github/workflows/unmanaged-dependency-check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.31.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0
       with:
         bom-path: google-cloud-firestore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index efe98f7d00..872ff5dd75 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.31.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 39bbbd80bf..d5b0a6c824 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.31.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0"
 }
 
 env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2fa1932b6..c6facb5567 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.21.5](https://github.com/googleapis/java-firestore/compare/v3.21.4...v3.21.5) (2024-06-25)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.32.0 ([#1710](https://github.com/googleapis/java-firestore/issues/1710)) ([2906472](https://github.com/googleapis/java-firestore/commit/2906472816001d4ffdc21f3b94a36de7d925f6dc))
+
 ## [3.21.4](https://github.com/googleapis/java-firestore/compare/v3.21.3...v3.21.4) (2024-06-10)
 
 
diff --git a/README.md b/README.md
index 5a56adb2c2..bacef8d1d7 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-firestore</artifactId>
-  <version>3.21.3</version>
+  <version>3.21.4</version>
 </dependency>
 
 ```
@@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.40.0')
+implementation platform('com.google.cloud:libraries-bom:26.42.0')
 
 implementation 'com.google.cloud:google-cloud-firestore'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-firestore:3.21.3'
+implementation 'com.google.cloud:google-cloud-firestore:3.21.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.21.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.21.4"
 ```
 <!-- {x-version-update-end} -->
 
@@ -222,7 +222,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-firestore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.21.3
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.21.4
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml
index 48b9d62da9..b9ab96b43a 100644
--- a/google-cloud-firestore-admin/pom.xml
+++ b/google-cloud-firestore-admin/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-firestore-admin</artifactId>
-  <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+  <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Firestore Admin Client</name>
   <url>https://github.com/googleapis/java-firestore</url>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-firestore-parent</artifactId>
-    <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml
index 32ea652aa2..1e535717a0 100644
--- a/google-cloud-firestore-bom/pom.xml
+++ b/google-cloud-firestore-bom/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-firestore-bom</artifactId>
-  <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
+  <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.31.0</version>
+    <version>3.32.0</version>
   </parent>
 
   <name>Google Cloud Firestore BOM</name>
@@ -52,37 +52,37 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-admin</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+        <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.5</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-firestore-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.21.5</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.5</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.21.5</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
+        <version>3.21.5</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
index d729c3f52d..ec0682a7ff 100644
--- a/google-cloud-firestore/pom.xml
+++ b/google-cloud-firestore/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-firestore</artifactId>
-  <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Firestore</name>
   <url>https://github.com/googleapis/java-firestore</url>
@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-firestore-parent</artifactId>
-    <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-firestore</site.installationModule>
diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml
index 2ff02e5671..744110694c 100644
--- a/grpc-google-cloud-firestore-admin-v1/pom.xml
+++ b/grpc-google-cloud-firestore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
-    <version>3.21.4</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+    <version>3.21.5</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
     <name>grpc-google-cloud-firestore-admin-v1</name>
     <description>GRPC library for grpc-google-cloud-firestore-admin-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml
index 92444df53c..b1e4941bd5 100644
--- a/grpc-google-cloud-firestore-v1/pom.xml
+++ b/grpc-google-cloud-firestore-v1/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>grpc-google-cloud-firestore-v1</artifactId>
-    <version>3.21.4</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+    <version>3.21.5</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
     <name>grpc-google-cloud-firestore-v1</name>
     <description>GRPC library for grpc-google-cloud-firestore-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/pom.xml b/pom.xml
index c3cfeb1c25..60dbfeef84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-firestore-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
   <name>Google Cloud Firestore Parent</name>
   <url>https://github.com/googleapis/java-firestore</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.31.0</version>
+    <version>3.32.0</version>
   </parent>
 
   <developers>
@@ -150,32 +150,32 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.5</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.21.5</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.5</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-firestore-v1</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.21.5</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
       </dependency>
 
       <dependency>
diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml
index 8565dbbe95..71c0921e13 100644
--- a/proto-google-cloud-firestore-admin-v1/pom.xml
+++ b/proto-google-cloud-firestore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-    <version>3.21.4</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+    <version>3.21.5</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
     <name>proto-google-cloud-firestore-admin-v1</name>
     <description>PROTO library for proto-google-cloud-firestore-admin-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-bundle-v1/pom.xml b/proto-google-cloud-firestore-bundle-v1/pom.xml
index 515d0fae13..ab4bec09d3 100644
--- a/proto-google-cloud-firestore-bundle-v1/pom.xml
+++ b/proto-google-cloud-firestore-bundle-v1/pom.xml
@@ -5,14 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
-    <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
 
     <name>proto-google-cloud-firestore-bundle-v1</name>
     <description>PROTO library for proto-google-cloud-firestore-bundle-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml
index 3d3cb12fea..557c595947 100644
--- a/proto-google-cloud-firestore-v1/pom.xml
+++ b/proto-google-cloud-firestore-v1/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>proto-google-cloud-firestore-v1</artifactId>
-    <version>3.21.4</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+    <version>3.21.5</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
     <name>proto-google-cloud-firestore-v1</name>
     <description>PROTO library for proto-google-cloud-firestore-v1</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-parent</artifactId>
-        <version>3.21.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.5</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index a06d88603f..201ec3728d 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-firestore</artifactId>
-      <version>3.21.3</version>
+      <version>3.21.4</version>
     </dependency>
     <!-- [END firestore_install_without_bom] -->
 
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index d6dd53f464..98c4c979f6 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -113,7 +113,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin
             </artifactId> <!-- Must use older version of surefire plugin for native-image testing. -->
-            <version>3.2.5</version>
+            <version>3.3.0</version>
             <configuration>
               <includes>
                 <include>**/IT*</include>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 6f53428d23..f08a5892dd 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-firestore</artifactId>
-      <version>3.21.3</version>
+      <version>3.21.4</version>
     </dependency>
 
     <dependency>
diff --git a/versions.txt b/versions.txt
index e30bab6a08..b9ba72bd94 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,11 +1,11 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-firestore:3.21.4:3.21.4
-google-cloud-firestore-admin:3.21.4:3.21.4
-google-cloud-firestore-bom:3.21.4:3.21.4
-grpc-google-cloud-firestore-admin-v1:3.21.4:3.21.4
-grpc-google-cloud-firestore-v1:3.21.4:3.21.4
-proto-google-cloud-firestore-admin-v1:3.21.4:3.21.4
-proto-google-cloud-firestore-v1:3.21.4:3.21.4
-proto-google-cloud-firestore-bundle-v1:3.21.4:3.21.4
+google-cloud-firestore:3.21.5:3.21.5
+google-cloud-firestore-admin:3.21.5:3.21.5
+google-cloud-firestore-bom:3.21.5:3.21.5
+grpc-google-cloud-firestore-admin-v1:3.21.5:3.21.5
+grpc-google-cloud-firestore-v1:3.21.5:3.21.5
+proto-google-cloud-firestore-admin-v1:3.21.5:3.21.5
+proto-google-cloud-firestore-v1:3.21.5:3.21.5
+proto-google-cloud-firestore-bundle-v1:3.21.5:3.21.5