diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 91bb69e63c..d7abbc602e 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:bf5639d265d70f6137d57d42ae781a6f4e26d4085ff4e018e71350480f9b3996
+  digest: sha256:3387f93d4577788512112ff69ddab746ae9192ddd9f13cfd175ef310d62d7d30
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59e752cd73..96fed7c106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [3.9.4](https://github.com/googleapis/java-firestore/compare/v3.9.3...v3.9.4) (2023-04-12)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.7.0 ([#1257](https://github.com/googleapis/java-firestore/issues/1257)) ([52db039](https://github.com/googleapis/java-firestore/commit/52db039efcc9330897fd0724929573b5d66fbfee))
+* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.21 ([#1258](https://github.com/googleapis/java-firestore/issues/1258)) ([12bcf02](https://github.com/googleapis/java-firestore/commit/12bcf0295fc9b1538b97b24ed7d3797fa97f0294))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.21 ([#1259](https://github.com/googleapis/java-firestore/issues/1259)) ([19b5da2](https://github.com/googleapis/java-firestore/commit/19b5da23da2b87b7041446582b9fc8cc08045456))
+
 ## [3.9.3](https://github.com/googleapis/java-firestore/compare/v3.9.2...v3.9.3) (2023-03-29)
 
 
diff --git a/README.md b/README.md
index d519332bc5..10063fe50d 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.11.0</version>
+      <version>26.12.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -34,14 +34,15 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
 
 ```
 
-If you are using Maven without BOM, add this to your dependencies:
+If you are using Maven without the BOM, add this to your dependencies:
 
+<!-- {x-version-update-start:google-cloud-firestore:released} -->
 
 ```xml
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-firestore</artifactId>
-  <version>3.9.2</version>
+  <version>3.9.3</version>
 </dependency>
 
 ```
@@ -49,20 +50,20 @@ If you are using Maven without 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.11.0')
+implementation platform('com.google.cloud:libraries-bom:26.12.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.9.2'
+implementation 'com.google.cloud:google-cloud-firestore:3.9.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.9.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.9.3"
 ```
 <!-- {x-version-update-end} -->
 
@@ -221,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.9.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.9.3
 [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
@@ -229,7 +230,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [developer-console]: https://console.developers.google.com/
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
 [cloud-cli]: https://cloud.google.com/cli
-[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
+[troubleshooting]: https://github.com/googleapis/google-cloud-java/blob/main/TROUBLESHOOTING.md
 [contributing]: https://github.com/googleapis/java-firestore/blob/main/CONTRIBUTING.md
 [code-of-conduct]: https://github.com/googleapis/java-firestore/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [license]: https://github.com/googleapis/java-firestore/blob/main/LICENSE
diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml
index c1987def39..ad2aee2547 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.9.3</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+  <version>3.9.4</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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.9.4</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 20d0fcf4d6..cd210c76ea 100644
--- a/google-cloud-firestore-bom/pom.xml
+++ b/google-cloud-firestore-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-firestore-bom</artifactId>
-  <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
+  <version>3.9.4</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -52,37 +52,37 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore</artifactId>
-        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-admin</artifactId>
-        <version>3.9.3</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
+        <version>3.9.4</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 d322d4c296..d72e8ece07 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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.9.4</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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.9.4</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 ac73c19c9a..0471e784f7 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.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+    <version>3.9.4</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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.4</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 ded52c725d..dca4058100 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.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+    <version>3.9.4</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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 813e77f6f5..5890a94527 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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.9.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
   <name>Google Cloud Firestore Parent</name>
   <url>https://github.com/googleapis/java-firestore</url>
   <description>
@@ -150,38 +150,38 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.9.4</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.9.3</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.9.4</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
       </dependency>
 
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml
index 8ec7ae5003..c15c1d9f39 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.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+    <version>3.9.4</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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DatabaseProto.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DatabaseProto.java
index 9924cab19a..6713e52d50 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DatabaseProto.java
+++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DatabaseProto.java
@@ -61,13 +61,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ON_MODE_UNSPECIFIED\020\000\022\013\n\007ENABLED\020\001\022\014\n\010DI"
           + "SABLED\020\002:R\352AO\n!firestore.googleapis.com/"
           + "Database\022\'projects/{project}/databases/{"
-          + "database}R\001\001B\341\001\n\035com.google.firestore.ad"
-          + "min.v1B\rDatabaseProtoP\001Z>google.golang.o"
-          + "rg/genproto/googleapis/firestore/admin/v"
-          + "1;admin\242\002\004GCFS\252\002\037Google.Cloud.Firestore."
-          + "Admin.V1\312\002\037Google\\Cloud\\Firestore\\Admin\\"
-          + "V1\352\002#Google::Cloud::Firestore::Admin::V1"
-          + "b\006proto3"
+          + "database}R\001\001B\334\001\n\035com.google.firestore.ad"
+          + "min.v1B\rDatabaseProtoP\001Z9cloud.google.co"
+          + "m/go/firestore/apiv1/admin/apiv1pb;apiv1"
+          + "pb\242\002\004GCFS\252\002\037Google.Cloud.Firestore.Admin"
+          + ".V1\312\002\037Google\\Cloud\\Firestore\\Admin\\V1\352\002#"
+          + "Google::Cloud::Firestore::Admin::V1b\006pro"
+          + "to3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldProto.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldProto.java
index 5fcc0320a6..71bf7054e1 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldProto.java
+++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldProto.java
@@ -66,13 +66,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ACTIVE\020\002\022\020\n\014NEEDS_REPAIR\020\003:y\352Av\n\036firesto"
           + "re.googleapis.com/Field\022Tprojects/{proje"
           + "ct}/databases/{database}/collectionGroup"
-          + "s/{collection}/fields/{field}B\336\001\n\035com.go"
-          + "ogle.firestore.admin.v1B\nFieldProtoP\001Z>g"
-          + "oogle.golang.org/genproto/googleapis/fir"
-          + "estore/admin/v1;admin\242\002\004GCFS\252\002\037Google.Cl"
-          + "oud.Firestore.Admin.V1\312\002\037Google\\Cloud\\Fi"
-          + "restore\\Admin\\V1\352\002#Google::Cloud::Firest"
-          + "ore::Admin::V1b\006proto3"
+          + "s/{collection}/fields/{field}B\331\001\n\035com.go"
+          + "ogle.firestore.admin.v1B\nFieldProtoP\001Z9c"
+          + "loud.google.com/go/firestore/apiv1/admin"
+          + "/apiv1pb;apiv1pb\242\002\004GCFS\252\002\037Google.Cloud.F"
+          + "irestore.Admin.V1\312\002\037Google\\Cloud\\Firesto"
+          + "re\\Admin\\V1\352\002#Google::Cloud::Firestore::"
+          + "Admin::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminProto.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminProto.java
index a607b4a0c8..9481ae54e3 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminProto.java
+++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminProto.java
@@ -212,18 +212,18 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "tabase\022\026UpdateDatabaseMetadata\032v\312A\030fires"
           + "tore.googleapis.com\322AXhttps://www.google"
           + "apis.com/auth/cloud-platform,https://www"
-          + ".googleapis.com/auth/datastoreB\252\003\n\035com.g"
+          + ".googleapis.com/auth/datastoreB\245\003\n\035com.g"
           + "oogle.firestore.admin.v1B\023FirestoreAdmin"
-          + "ProtoP\001Z>google.golang.org/genproto/goog"
-          + "leapis/firestore/admin/v1;admin\242\002\004GCFS\252\002"
-          + "\037Google.Cloud.Firestore.Admin.V1\312\002\037Googl"
-          + "e\\Cloud\\Firestore\\Admin\\V1\352\002#Google::Clo"
-          + "ud::Firestore::Admin::V1\352AL\n!firestore.g"
-          + "oogleapis.com/Location\022\'projects/{projec"
-          + "t}/locations/{location}\352Aq\n(firestore.go"
-          + "ogleapis.com/CollectionGroup\022Eprojects/{"
-          + "project}/databases/{database}/collection"
-          + "Groups/{collection}b\006proto3"
+          + "ProtoP\001Z9cloud.google.com/go/firestore/a"
+          + "piv1/admin/apiv1pb;apiv1pb\242\002\004GCFS\252\002\037Goog"
+          + "le.Cloud.Firestore.Admin.V1\312\002\037Google\\Clo"
+          + "ud\\Firestore\\Admin\\V1\352\002#Google::Cloud::F"
+          + "irestore::Admin::V1\352AL\n!firestore.google"
+          + "apis.com/Location\022\'projects/{project}/lo"
+          + "cations/{location}\352Aq\n(firestore.googlea"
+          + "pis.com/CollectionGroup\022Eprojects/{proje"
+          + "ct}/databases/{database}/collectionGroup"
+          + "s/{collection}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexProto.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexProto.java
index c30e16305a..e89bc6e1f6 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexProto.java
+++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexProto.java
@@ -66,13 +66,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\014NEEDS_REPAIR\020\003:z\352Aw\n\036firestore.googleap"
           + "is.com/Index\022Uprojects/{project}/databas"
           + "es/{database}/collectionGroups/{collecti"
-          + "on}/indexes/{index}B\336\001\n\035com.google.fires"
-          + "tore.admin.v1B\nIndexProtoP\001Z>google.gola"
-          + "ng.org/genproto/googleapis/firestore/adm"
-          + "in/v1;admin\242\002\004GCFS\252\002\037Google.Cloud.Firest"
-          + "ore.Admin.V1\312\002\037Google\\Cloud\\Firestore\\Ad"
-          + "min\\V1\352\002#Google::Cloud::Firestore::Admin"
-          + "::V1b\006proto3"
+          + "on}/indexes/{index}B\331\001\n\035com.google.fires"
+          + "tore.admin.v1B\nIndexProtoP\001Z9cloud.googl"
+          + "e.com/go/firestore/apiv1/admin/apiv1pb;a"
+          + "piv1pb\242\002\004GCFS\252\002\037Google.Cloud.Firestore.A"
+          + "dmin.V1\312\002\037Google\\Cloud\\Firestore\\Admin\\V"
+          + "1\352\002#Google::Cloud::Firestore::Admin::V1b"
+          + "\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationProto.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationProto.java
index be694b9a82..bd95a3dac0 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationProto.java
+++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationProto.java
@@ -42,13 +42,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n(google/firestore/admin/v1/location.pro"
           + "to\022\031google.firestore.admin.v1\"\022\n\020Locatio"
-          + "nMetadataB\341\001\n\035com.google.firestore.admin"
-          + ".v1B\rLocationProtoP\001Z>google.golang.org/"
-          + "genproto/googleapis/firestore/admin/v1;a"
-          + "dmin\242\002\004GCFS\252\002\037Google.Cloud.Firestore.Adm"
-          + "in.V1\312\002\037Google\\Cloud\\Firestore\\Admin\\V1\352"
-          + "\002#Google::Cloud::Firestore::Admin::V1b\006p"
-          + "roto3"
+          + "nMetadataB\334\001\n\035com.google.firestore.admin"
+          + ".v1B\rLocationProtoP\001Z9cloud.google.com/g"
+          + "o/firestore/apiv1/admin/apiv1pb;apiv1pb\242"
+          + "\002\004GCFS\252\002\037Google.Cloud.Firestore.Admin.V1"
+          + "\312\002\037Google\\Cloud\\Firestore\\Admin\\V1\352\002#Goo"
+          + "gle::Cloud::Firestore::Admin::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/OperationProto.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/OperationProto.java
index 7c4df1fa19..f307fd4353 100644
--- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/OperationProto.java
+++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/OperationProto.java
@@ -127,13 +127,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "erationState\022\037\n\033OPERATION_STATE_UNSPECIF"
           + "IED\020\000\022\020\n\014INITIALIZING\020\001\022\016\n\nPROCESSING\020\002\022"
           + "\016\n\nCANCELLING\020\003\022\016\n\nFINALIZING\020\004\022\016\n\nSUCCE"
-          + "SSFUL\020\005\022\n\n\006FAILED\020\006\022\r\n\tCANCELLED\020\007B\342\001\n\035c"
+          + "SSFUL\020\005\022\n\n\006FAILED\020\006\022\r\n\tCANCELLED\020\007B\335\001\n\035c"
           + "om.google.firestore.admin.v1B\016OperationP"
-          + "rotoP\001Z>google.golang.org/genproto/googl"
-          + "eapis/firestore/admin/v1;admin\242\002\004GCFS\252\002\037"
-          + "Google.Cloud.Firestore.Admin.V1\312\002\037Google"
-          + "\\Cloud\\Firestore\\Admin\\V1\352\002#Google::Clou"
-          + "d::Firestore::Admin::V1b\006proto3"
+          + "rotoP\001Z9cloud.google.com/go/firestore/ap"
+          + "iv1/admin/apiv1pb;apiv1pb\242\002\004GCFS\252\002\037Googl"
+          + "e.Cloud.Firestore.Admin.V1\312\002\037Google\\Clou"
+          + "d\\Firestore\\Admin\\V1\352\002#Google::Cloud::Fi"
+          + "restore::Admin::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
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 3f242c3e15..6ebb0e9651 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
@@ -20,7 +20,7 @@ import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/admin/v1;admin";
+option go_package = "cloud.google.com/go/firestore/apiv1/admin/apiv1pb;apiv1pb";
 option java_multiple_files = true;
 option java_outer_classname = "DatabaseProto";
 option java_package = "com.google.firestore.admin.v1";
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 0bbb11d8ac..eb6c38f221 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
@@ -21,7 +21,7 @@ import "google/api/resource.proto";
 import "google/firestore/admin/v1/index.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/admin/v1;admin";
+option go_package = "cloud.google.com/go/firestore/apiv1/admin/apiv1pb;apiv1pb";
 option java_multiple_files = true;
 option java_outer_classname = "FieldProto";
 option java_package = "com.google.firestore.admin.v1";
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 c493673aee..b8396bf7d8 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
@@ -28,7 +28,7 @@ import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/admin/v1;admin";
+option go_package = "cloud.google.com/go/firestore/apiv1/admin/apiv1pb;apiv1pb";
 option java_multiple_files = true;
 option java_outer_classname = "FirestoreAdminProto";
 option java_package = "com.google.firestore.admin.v1";
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 066d4109fd..f9404bb03c 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
@@ -19,7 +19,7 @@ package google.firestore.admin.v1;
 import "google/api/resource.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/admin/v1;admin";
+option go_package = "cloud.google.com/go/firestore/apiv1/admin/apiv1pb;apiv1pb";
 option java_multiple_files = true;
 option java_outer_classname = "IndexProto";
 option java_package = "com.google.firestore.admin.v1";
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 8f7519c4d5..4a3a099e8b 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
@@ -17,7 +17,7 @@ syntax = "proto3";
 package google.firestore.admin.v1;
 
 option csharp_namespace = "Google.Cloud.Firestore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/admin/v1;admin";
+option go_package = "cloud.google.com/go/firestore/apiv1/admin/apiv1pb;apiv1pb";
 option java_multiple_files = true;
 option java_outer_classname = "LocationProto";
 option java_package = "com.google.firestore.admin.v1";
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 654a6ad6ce..65a3f1afda 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
@@ -20,7 +20,7 @@ import "google/firestore/admin/v1/index.proto";
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/admin/v1;admin";
+option go_package = "cloud.google.com/go/firestore/apiv1/admin/apiv1pb;apiv1pb";
 option java_multiple_files = true;
 option java_outer_classname = "OperationProto";
 option java_package = "com.google.firestore.admin.v1";
diff --git a/proto-google-cloud-firestore-bundle-v1/pom.xml b/proto-google-cloud-firestore-bundle-v1/pom.xml
index a501a5ecca..8e25424744 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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.9.4</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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.4</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 734a14aac3..6dc240cd3a 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.9.3</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+    <version>3.9.4</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.9.3</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.9.4</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/AggregationResultProto.java b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/AggregationResultProto.java
index c744962091..8b1862f71f 100644
--- a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/AggregationResultProto.java
+++ b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/AggregationResultProto.java
@@ -51,12 +51,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + ".firestore.v1.AggregationResult.Aggregat"
           + "eFieldsEntry\032R\n\024AggregateFieldsEntry\022\013\n\003"
           + "key\030\001 \001(\t\022)\n\005value\030\002 \001(\0132\032.google.firest"
-          + "ore.v1.Value:\0028\001B\317\001\n\027com.google.firestor"
-          + "e.v1B\026AggregationResultProtoP\001Z<google.g"
-          + "olang.org/genproto/googleapis/firestore/"
-          + "v1;firestore\242\002\004GCFS\252\002\031Google.Cloud.Fires"
-          + "tore.V1\312\002\031Google\\Cloud\\Firestore\\V1\352\002\034Go"
-          + "ogle::Cloud::Firestore::V1b\006proto3"
+          + "ore.v1.Value:\0028\001B\316\001\n\027com.google.firestor"
+          + "e.v1B\026AggregationResultProtoP\001Z;cloud.go"
+          + "ogle.com/go/firestore/apiv1/firestorepb;"
+          + "firestorepb\242\002\004GCFS\252\002\031Google.Cloud.Firest"
+          + "ore.V1\312\002\031Google\\Cloud\\Firestore\\V1\352\002\034Goo"
+          + "gle::Cloud::Firestore::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommonProto.java b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommonProto.java
index 4ab05e4409..91c88f112b 100644
--- a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommonProto.java
+++ b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommonProto.java
@@ -69,12 +69,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "eadWrite\022\031\n\021retry_transaction\030\001 \001(\014\032S\n\010R"
           + "eadOnly\022/\n\tread_time\030\002 \001(\0132\032.google.prot"
           + "obuf.TimestampH\000B\026\n\024consistency_selector"
-          + "B\006\n\004modeB\304\001\n\027com.google.firestore.v1B\013Co"
-          + "mmonProtoP\001Z<google.golang.org/genproto/"
-          + "googleapis/firestore/v1;firestore\242\002\004GCFS"
-          + "\252\002\031Google.Cloud.Firestore.V1\312\002\031Google\\Cl"
-          + "oud\\Firestore\\V1\352\002\034Google::Cloud::Firest"
-          + "ore::V1b\006proto3"
+          + "B\006\n\004modeB\303\001\n\027com.google.firestore.v1B\013Co"
+          + "mmonProtoP\001Z;cloud.google.com/go/firesto"
+          + "re/apiv1/firestorepb;firestorepb\242\002\004GCFS\252"
+          + "\002\031Google.Cloud.Firestore.V1\312\002\031Google\\Clo"
+          + "ud\\Firestore\\V1\352\002\034Google::Cloud::Firesto"
+          + "re::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentProto.java b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentProto.java
index fa2fc03e63..a5fbc45495 100644
--- a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentProto.java
+++ b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentProto.java
@@ -86,12 +86,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\001 \003(\0132).google.firestore.v1.MapValue.Fie"
           + "ldsEntry\032I\n\013FieldsEntry\022\013\n\003key\030\001 \001(\t\022)\n\005"
           + "value\030\002 \001(\0132\032.google.firestore.v1.Value:"
-          + "\0028\001B\306\001\n\027com.google.firestore.v1B\rDocumen"
-          + "tProtoP\001Z<google.golang.org/genproto/goo"
-          + "gleapis/firestore/v1;firestore\242\002\004GCFS\252\002\031"
-          + "Google.Cloud.Firestore.V1\312\002\031Google\\Cloud"
-          + "\\Firestore\\V1\352\002\034Google::Cloud::Firestore"
-          + "::V1b\006proto3"
+          + "\0028\001B\305\001\n\027com.google.firestore.v1B\rDocumen"
+          + "tProtoP\001Z;cloud.google.com/go/firestore/"
+          + "apiv1/firestorepb;firestorepb\242\002\004GCFS\252\002\031G"
+          + "oogle.Cloud.Firestore.V1\312\002\031Google\\Cloud\\"
+          + "Firestore\\V1\352\002\034Google::Cloud::Firestore:"
+          + ":V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreProto.java b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreProto.java
index fa835f66b4..181dcee36e 100644
--- a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreProto.java
+++ b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreProto.java
@@ -406,12 +406,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "id}:\010document\032v\312A\030firestore.googleapis.c"
           + "om\322AXhttps://www.googleapis.com/auth/clo"
           + "ud-platform,https://www.googleapis.com/a"
-          + "uth/datastoreB\300\001\n\027com.google.firestore.v"
-          + "1B\016FirestoreProtoP\001Z<google.golang.org/g"
-          + "enproto/googleapis/firestore/v1;firestor"
-          + "e\252\002\031Google.Cloud.Firestore.V1\312\002\031Google\\C"
-          + "loud\\Firestore\\V1\352\002\034Google::Cloud::Fires"
-          + "tore::V1b\006proto3"
+          + "uth/datastoreB\277\001\n\027com.google.firestore.v"
+          + "1B\016FirestoreProtoP\001Z;cloud.google.com/go"
+          + "/firestore/apiv1/firestorepb;firestorepb"
+          + "\252\002\031Google.Cloud.Firestore.V1\312\002\031Google\\Cl"
+          + "oud\\Firestore\\V1\352\002\034Google::Cloud::Firest"
+          + "ore::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/QueryProto.java b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/QueryProto.java
index 7133ad1412..2bc291fa27 100644
--- a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/QueryProto.java
+++ b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/QueryProto.java
@@ -153,12 +153,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "rotobuf.Int64ValueB\003\340A\001B\n\n\010operatorB\014\n\nq"
           + "uery_type\"D\n\006Cursor\022*\n\006values\030\001 \003(\0132\032.go"
           + "ogle.firestore.v1.Value\022\016\n\006before\030\002 \001(\010B"
-          + "\303\001\n\027com.google.firestore.v1B\nQueryProtoP"
-          + "\001Z<google.golang.org/genproto/googleapis"
-          + "/firestore/v1;firestore\242\002\004GCFS\252\002\031Google."
-          + "Cloud.Firestore.V1\312\002\031Google\\Cloud\\Firest"
-          + "ore\\V1\352\002\034Google::Cloud::Firestore::V1b\006p"
-          + "roto3"
+          + "\302\001\n\027com.google.firestore.v1B\nQueryProtoP"
+          + "\001Z;cloud.google.com/go/firestore/apiv1/f"
+          + "irestorepb;firestorepb\242\002\004GCFS\252\002\031Google.C"
+          + "loud.Firestore.V1\312\002\031Google\\Cloud\\Firesto"
+          + "re\\V1\352\002\034Google::Cloud::Firestore::V1b\006pr"
+          + "oto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteProto.java b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteProto.java
index bb8c49df70..81eb14ec9d 100644
--- a/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteProto.java
+++ b/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteProto.java
@@ -108,12 +108,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "Remove\022\020\n\010document\030\001 \001(\t\022\032\n\022removed_targ"
           + "et_ids\030\002 \003(\005\022-\n\tread_time\030\004 \001(\0132\032.google"
           + ".protobuf.Timestamp\"3\n\017ExistenceFilter\022\021"
-          + "\n\ttarget_id\030\001 \001(\005\022\r\n\005count\030\002 \001(\005B\303\001\n\027com"
-          + ".google.firestore.v1B\nWriteProtoP\001Z<goog"
-          + "le.golang.org/genproto/googleapis/firest"
-          + "ore/v1;firestore\242\002\004GCFS\252\002\031Google.Cloud.F"
-          + "irestore.V1\312\002\031Google\\Cloud\\Firestore\\V1\352"
-          + "\002\034Google::Cloud::Firestore::V1b\006proto3"
+          + "\n\ttarget_id\030\001 \001(\005\022\r\n\005count\030\002 \001(\005B\302\001\n\027com"
+          + ".google.firestore.v1B\nWriteProtoP\001Z;clou"
+          + "d.google.com/go/firestore/apiv1/firestor"
+          + "epb;firestorepb\242\002\004GCFS\252\002\031Google.Cloud.Fi"
+          + "restore.V1\312\002\031Google\\Cloud\\Firestore\\V1\352\002"
+          + "\034Google::Cloud::Firestore::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
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 dc0d172a24..87ff8d3fcc 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
@@ -19,7 +19,7 @@ package google.firestore.v1;
 import "google/firestore/v1/document.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option go_package = "cloud.google.com/go/firestore/apiv1/firestorepb;firestorepb";
 option java_multiple_files = true;
 option java_outer_classname = "AggregationResultProto";
 option java_package = "com.google.firestore.v1";
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 c1bd92d8fe..ab02ec76ee 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
@@ -19,7 +19,7 @@ package google.firestore.v1;
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option go_package = "cloud.google.com/go/firestore/apiv1/firestorepb;firestorepb";
 option java_multiple_files = true;
 option java_outer_classname = "CommonProto";
 option java_package = "com.google.firestore.v1";
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 41283588eb..41317245f1 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
@@ -21,7 +21,7 @@ import "google/protobuf/timestamp.proto";
 import "google/type/latlng.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option go_package = "cloud.google.com/go/firestore/apiv1/firestorepb;firestorepb";
 option java_multiple_files = true;
 option java_outer_classname = "DocumentProto";
 option java_package = "com.google.firestore.v1";
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 b62bf64e5d..2de2116b20 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
@@ -29,7 +29,7 @@ import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option go_package = "cloud.google.com/go/firestore/apiv1/firestorepb;firestorepb";
 option java_multiple_files = true;
 option java_outer_classname = "FirestoreProto";
 option java_package = "com.google.firestore.v1";
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 6d8ffce807..faf1f7b0f4 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
@@ -21,7 +21,7 @@ import "google/firestore/v1/document.proto";
 import "google/protobuf/wrappers.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option go_package = "cloud.google.com/go/firestore/apiv1/firestorepb;firestorepb";
 option java_multiple_files = true;
 option java_outer_classname = "QueryProto";
 option java_package = "com.google.firestore.v1";
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 3cc3b84297..50001487c3 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
@@ -21,7 +21,7 @@ import "google/firestore/v1/document.proto";
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
-option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option go_package = "cloud.google.com/go/firestore/apiv1/firestorepb;firestorepb";
 option java_multiple_files = true;
 option java_outer_classname = "WriteProto";
 option java_package = "com.google.firestore.v1";
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 96370b4d0f..6eb957f219 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.9.2</version>
+      <version>3.9.3</version>
     </dependency>
     <!-- [END firestore_install_without_bom] -->
 
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index fcbec268d0..94c8a71493 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.11.0</version>
+        <version>26.12.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -102,7 +102,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <dependency>
           <groupId>org.graalvm.buildtools</groupId>
           <artifactId>junit-platform-native</artifactId>
-          <version>0.9.20</version>
+          <version>0.9.21</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
@@ -123,7 +123,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>0.9.20</version>
+            <version>0.9.21</version>
             <extensions>true</extensions>
             <configuration>
               <mainClass>com.example.firestore.NativeImageFirestoreSample</mainClass>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f7263c9e65..abc1e961cc 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.9.2</version>
+      <version>3.9.3</version>
     </dependency>
 
     <dependency>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index f92ed13399..83d134bd03 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.11.0</version>
+        <version>26.12.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/versions.txt b/versions.txt
index 8ff2963dda..3b05f53515 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,11 +1,11 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-firestore:3.9.3:3.9.3
-google-cloud-firestore-admin:3.9.3:3.9.3
-google-cloud-firestore-bom:3.9.3:3.9.3
-grpc-google-cloud-firestore-admin-v1:3.9.3:3.9.3
-grpc-google-cloud-firestore-v1:3.9.3:3.9.3
-proto-google-cloud-firestore-admin-v1:3.9.3:3.9.3
-proto-google-cloud-firestore-v1:3.9.3:3.9.3
-proto-google-cloud-firestore-bundle-v1:3.9.3:3.9.3
+google-cloud-firestore:3.9.4:3.9.4
+google-cloud-firestore-admin:3.9.4:3.9.4
+google-cloud-firestore-bom:3.9.4:3.9.4
+grpc-google-cloud-firestore-admin-v1:3.9.4:3.9.4
+grpc-google-cloud-firestore-v1:3.9.4:3.9.4
+proto-google-cloud-firestore-admin-v1:3.9.4:3.9.4
+proto-google-cloud-firestore-v1:3.9.4:3.9.4
+proto-google-cloud-firestore-bundle-v1:3.9.4:3.9.4