diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1ed094ce..e2d40ff7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [3.31.8](https://github.com/googleapis/java-firestore/compare/v3.31.7...v3.31.8) (2025-07-02)
+
+
+### Dependencies
+
+* Update beam.version to v2.66.0 ([#2172](https://github.com/googleapis/java-firestore/issues/2172)) ([4b7f49e](https://github.com/googleapis/java-firestore/commit/4b7f49ea48a0a6e9768687e9ec2d05ca3d2dc5a0))
+* Update dependency com.google.api.grpc:proto-google-cloud-trace-v1 to v2.67.0 ([#2167](https://github.com/googleapis/java-firestore/issues/2167)) ([3c95bf1](https://github.com/googleapis/java-firestore/commit/3c95bf10becd5c84e1ed25fa24e78ef074e3d267))
+* Update dependency com.google.cloud:google-cloud-trace to v2.67.0 ([#2166](https://github.com/googleapis/java-firestore/issues/2166)) ([7920b5b](https://github.com/googleapis/java-firestore/commit/7920b5b0de25057fe4a58948bf7112171f795672))
+* Update dependency com.google.cloud.opentelemetry:exporter-trace to v0.36.0 ([#2159](https://github.com/googleapis/java-firestore/issues/2159)) ([edcb508](https://github.com/googleapis/java-firestore/commit/edcb508d3b144db073a8aeaaf8a37e535a00bc0d))
+* Update googleapis/sdk-platform-java action to v2.60.0 ([#2163](https://github.com/googleapis/java-firestore/issues/2163)) ([4660432](https://github.com/googleapis/java-firestore/commit/466043294afd9cc10a330c87873595b65e76bf4c))
+* Update googleapis/sdk-platform-java action to v2.60.0 ([#2173](https://github.com/googleapis/java-firestore/issues/2173)) ([4fddfea](https://github.com/googleapis/java-firestore/commit/4fddfea2b14dd7f9b54e72d2f4889e2a3d5f5d2d))
+
 ## [3.31.7](https://github.com/googleapis/java-firestore/compare/v3.31.6...v3.31.7) (2025-06-25)
 
 
diff --git a/README.md b/README.md
index c2d03a708..9ebefdf62 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.62.0</version>
+      <version>26.63.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -56,13 +56,13 @@ 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.31.7'
+implementation 'com.google.cloud:google-cloud-firestore:3.31.8'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.31.7"
+libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.31.8"
 ```
 
 ## Authentication
@@ -219,7 +219,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.31.7
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.31.8
 [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 427be3b7d..0432ba121 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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+  <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.31.8</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 03237b57e..42647ce2b 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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
+  <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.31.8</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-admin</artifactId>
-        <version>3.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
+        <version>3.31.8</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 1d873e61d..1606ee730 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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.31.8</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 8c0b88df4..7c1033b8a 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.31.8-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+    <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.31.8</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 5b749fce7..d14fa962d 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.31.8-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+    <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.31.8</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/pom.xml b/pom.xml
index eb9749a68..304086c49 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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.31.8</version><!-- {x-version-update:google-cloud-firestore:current} -->
   <name>Google Cloud Firestore Parent</name>
   <url>https://github.com/googleapis/java-firestore</url>
   <description>
@@ -150,32 +150,32 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-        <version>3.31.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.31.8</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 e189124cf..e18fd4fca 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.31.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+    <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.31.8</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 39ee4cbab..61b07b1f9 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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.31.8</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 4aad4e9c9..3d5c4ab84 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.31.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+    <version>3.31.8</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.31.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.31.8</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/versions.txt b/versions.txt
index 7eaf52170..592c3e211 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,11 +1,11 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-firestore:3.31.7:3.31.8-SNAPSHOT
-google-cloud-firestore-admin:3.31.7:3.31.8-SNAPSHOT
-google-cloud-firestore-bom:3.31.7:3.31.8-SNAPSHOT
-grpc-google-cloud-firestore-admin-v1:3.31.7:3.31.8-SNAPSHOT
-grpc-google-cloud-firestore-v1:3.31.7:3.31.8-SNAPSHOT
-proto-google-cloud-firestore-admin-v1:3.31.7:3.31.8-SNAPSHOT
-proto-google-cloud-firestore-v1:3.31.7:3.31.8-SNAPSHOT
-proto-google-cloud-firestore-bundle-v1:3.31.7:3.31.8-SNAPSHOT
+google-cloud-firestore:3.31.8:3.31.8
+google-cloud-firestore-admin:3.31.8:3.31.8
+google-cloud-firestore-bom:3.31.8:3.31.8
+grpc-google-cloud-firestore-admin-v1:3.31.8:3.31.8
+grpc-google-cloud-firestore-v1:3.31.8:3.31.8
+proto-google-cloud-firestore-admin-v1:3.31.8:3.31.8
+proto-google-cloud-firestore-v1:3.31.8:3.31.8
+proto-google-cloud-firestore-bundle-v1:3.31.8:3.31.8