diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 6983bb2634..5db36a5f7d 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:25b384ee1674eda3984ec41c15b514a63bbeb5eda4d57c73c7e6f5adef2fd2f1
-# created: 2024-04-05T19:12:34.133475268Z
+  digest: sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e
+# created: 2024-05-09T16:31:37.168667071Z
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index f5fc7d5169..59f00b8eb6 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
           script: |
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ae66b1973b..b91fa381f5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -27,8 +27,8 @@ jobs:
       matrix:
         java: [11, 17, 21]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: ${{matrix.java}}
@@ -41,8 +41,8 @@ jobs:
     name: "units (8)"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 8
           distribution: temurin
@@ -51,7 +51,7 @@ jobs:
         # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
         run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
         shell: bash
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
@@ -63,8 +63,8 @@ jobs:
     steps:
     - name: Support longpaths
       run: git config --system core.longpaths true
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 8
@@ -78,8 +78,8 @@ jobs:
       matrix:
         java: [17]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: ${{matrix.java}}
@@ -88,8 +88,8 @@ jobs:
   javadoc:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
@@ -100,8 +100,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 11
@@ -112,8 +112,8 @@ jobs:
   clirr:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 8
diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml
index 87d8eb2be8..7c5ec7865e 100644
--- a/.github/workflows/renovate_config_check.yaml
+++ b/.github/workflows/renovate_config_check.yaml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: '20'
 
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index 10d252d775..03b2939567 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -20,8 +20,8 @@ jobs:
   checkstyle:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8
diff --git a/.github/workflows/unmanaged-dependency-check.yaml b/.github/workflows/unmanaged-dependency-check.yaml
index a94f299371..4aba18052e 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.30.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.1
       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 5ea87bfa4d..bc983b7887 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.30.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.1"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 49806ef21f..09e39fb4ba 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.30.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.1"
 }
 
 env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ac7d91365..53602830d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.21.2](https://github.com/googleapis/java-firestore/compare/v3.21.1...v3.21.2) (2024-05-16)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1681](https://github.com/googleapis/java-firestore/issues/1681)) ([9fb8531](https://github.com/googleapis/java-firestore/commit/9fb853147d5af34a3ec7e68317be8e588a7cae91))
+
 ## [3.21.1](https://github.com/googleapis/java-firestore/compare/v3.21.0...v3.21.1) (2024-05-03)
 
 
diff --git a/README.md b/README.md
index 2c1afd2ca1..816c2e7897 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.38.0</version>
+      <version>26.39.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -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.0</version>
+  <version>3.21.1</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.38.0')
+implementation platform('com.google.cloud:libraries-bom:26.39.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.0'
+implementation 'com.google.cloud:google-cloud-firestore:3.21.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.21.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.21.1"
 ```
 <!-- {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.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.21.1
 [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 17bd0e7b5a..1b303f1ffd 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.1</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+  <version>3.21.2</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.21.2</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 d6d2cdd85e..2483a799da 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.1</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
+  <version>3.21.2</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.30.0</version>
+    <version>3.30.1</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-admin</artifactId>
-        <version>3.21.1</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
+        <version>3.21.2</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 72a057307c..cba1068d8f 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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.21.2</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.21.2</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 d10fb92b07..82dc2aab8d 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.1</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+    <version>3.21.2</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.2</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 bdb31393a8..4414d922a6 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.1</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+    <version>3.21.2</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 4bde11d5ee..8cfece06f9 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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.21.2</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.30.0</version>
+    <version>3.30.1</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.1</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.2</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.1</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.21.2</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 d9b6c20041..3ec3be4e7c 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.1</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+    <version>3.21.2</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/backup.proto b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/backup.proto
index e01f81ff89..45f3adc8ea 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/backup.proto
+++ b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/backup.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/database.proto b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/database.proto
index fbf4bd7540..67c8371df2 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/database.proto
+++ b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/database.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/field.proto b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/field.proto
index 5cd1cd4810..930f911463 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/field.proto
+++ b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/field.proto
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/firestore_admin.proto b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/firestore_admin.proto
index a9bfa6ec95..2a19b4feac 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/firestore_admin.proto
+++ b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/firestore_admin.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/index.proto b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/index.proto
index add5c3f3f0..2eec079d38 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/index.proto
+++ b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/index.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/location.proto b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/location.proto
index 71f4247ae8..4a1154f8c0 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/location.proto
+++ b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/location.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/operation.proto b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/operation.proto
index d3d3e43e46..1087e8cfcb 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/operation.proto
+++ b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/operation.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/schedule.proto b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/schedule.proto
index 7a45238f08..52200e8e5c 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/schedule.proto
+++ b/proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/schedule.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-bundle-v1/pom.xml b/proto-google-cloud-firestore-bundle-v1/pom.xml
index 11a02f917c..2a6c734f0b 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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.21.2</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-bundle-v1/src/main/proto/google/firestore/bundle/bundle.proto b/proto-google-cloud-firestore-bundle-v1/src/main/proto/google/firestore/bundle/bundle.proto
index be4e9238eb..4f9cb7e34b 100644
--- a/proto-google-cloud-firestore-bundle-v1/src/main/proto/google/firestore/bundle/bundle.proto
+++ b/proto-google-cloud-firestore-bundle-v1/src/main/proto/google/firestore/bundle/bundle.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC.
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml
index 1763b7a0e8..3a8f27f73b 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.1</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+    <version>3.21.2</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.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.2</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/aggregation_result.proto b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/aggregation_result.proto
index 05fea5da9b..25e5d2e2e1 100644
--- a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/aggregation_result.proto
+++ b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/aggregation_result.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/bloom_filter.proto b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/bloom_filter.proto
index c00bb9c171..1b9eb376f2 100644
--- a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/bloom_filter.proto
+++ b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/bloom_filter.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/common.proto b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/common.proto
index 2a562aa6ec..fcb0f49fb0 100644
--- a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/common.proto
+++ b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/common.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/document.proto b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/document.proto
index a8764a1a28..5ad6752aa0 100644
--- a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/document.proto
+++ b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/document.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/firestore.proto b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/firestore.proto
index 8d78ce4f45..2ed6bf070c 100644
--- a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/firestore.proto
+++ b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/firestore.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/query.proto b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/query.proto
index 68d9d54588..f0fda1832c 100644
--- a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/query.proto
+++ b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/query.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/query_profile.proto b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/query_profile.proto
index 931e083b02..de27144a03 100644
--- a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/query_profile.proto
+++ b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/query_profile.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/write.proto b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/write.proto
index 4b46595ce4..fca7fab8ab 100644
--- a/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/write.proto
+++ b/proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/write.proto
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 714d5eba26..4273589536 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.0</version>
+      <version>3.21.1</version>
     </dependency>
     <!-- [END firestore_install_without_bom] -->
 
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 0b00ac0ef4..02c9b7f082 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -32,7 +32,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.38.0</version>
+        <version>26.39.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index de50b4a399..1218cedf42 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.0</version>
+      <version>3.21.1</version>
     </dependency>
 
     <dependency>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index d3b8e681a2..00dee3e762 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.38.0</version>
+        <version>26.39.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/versions.txt b/versions.txt
index 77d6feb62b..6dc9d9b1ae 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,11 +1,11 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-firestore:3.21.1:3.21.1
-google-cloud-firestore-admin:3.21.1:3.21.1
-google-cloud-firestore-bom:3.21.1:3.21.1
-grpc-google-cloud-firestore-admin-v1:3.21.1:3.21.1
-grpc-google-cloud-firestore-v1:3.21.1:3.21.1
-proto-google-cloud-firestore-admin-v1:3.21.1:3.21.1
-proto-google-cloud-firestore-v1:3.21.1:3.21.1
-proto-google-cloud-firestore-bundle-v1:3.21.1:3.21.1
+google-cloud-firestore:3.21.2:3.21.2
+google-cloud-firestore-admin:3.21.2:3.21.2
+google-cloud-firestore-bom:3.21.2:3.21.2
+grpc-google-cloud-firestore-admin-v1:3.21.2:3.21.2
+grpc-google-cloud-firestore-v1:3.21.2:3.21.2
+proto-google-cloud-firestore-admin-v1:3.21.2:3.21.2
+proto-google-cloud-firestore-v1:3.21.2:3.21.2
+proto-google-cloud-firestore-bundle-v1:3.21.2:3.21.2