diff --git a/CHANGELOG.md b/CHANGELOG.md
index f682d2679..6ac7d9136 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [3.21.1](https://github.com/googleapis/java-firestore/compare/v3.21.0...v3.21.1) (2024-05-03)
+
+
+### Bug Fixes
+
+* Add configurable to run tests against different firestore backends ([#1659](https://github.com/googleapis/java-firestore/issues/1659)) ([a60d2a3](https://github.com/googleapis/java-firestore/commit/a60d2a3622a7193844f150a005bfb89204fc43af))
+
+
+### Dependencies
+
+* Update beam.version to v2.56.0 ([#1669](https://github.com/googleapis/java-firestore/issues/1669)) ([a4b4d1d](https://github.com/googleapis/java-firestore/commit/a4b4d1dc3e5b13209efb288f0cead7bcea2013e0))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1670](https://github.com/googleapis/java-firestore/issues/1670)) ([5bcbf88](https://github.com/googleapis/java-firestore/commit/5bcbf88b1174d5e2615f66d9997be76481842131))
+
 ## [3.21.0](https://github.com/googleapis/java-firestore/compare/v3.20.2...v3.21.0) (2024-04-26)
 
 
diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml
index 9fcd3ba72..17bd0e7b5 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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+  <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.21.1</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 5f2009489..d6d2cdd85 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.21.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
+  <version>3.21.1</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.21.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
+        <version>3.21.1</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 aff727953..72a057307 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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.21.1</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 3ffc32d0c..d10fb92b0 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-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+    <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.1</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 f84043629..bdb31393a 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-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+    <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 035f65906..4bde11d5e 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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>3.21.1</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.21.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>3.21.1</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 6d19553b1..d9b6c2004 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-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+    <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.1</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 a6db473fc..11a02f917 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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.1</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 2edc60ee9..1763b7a0e 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-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+    <version>3.21.1</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-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>3.21.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/versions.txt b/versions.txt
index 617f5af13..77d6feb62 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,11 +1,11 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-firestore:3.21.0:3.21.1-SNAPSHOT
-google-cloud-firestore-admin:3.21.0:3.21.1-SNAPSHOT
-google-cloud-firestore-bom:3.21.0:3.21.1-SNAPSHOT
-grpc-google-cloud-firestore-admin-v1:3.21.0:3.21.1-SNAPSHOT
-grpc-google-cloud-firestore-v1:3.21.0:3.21.1-SNAPSHOT
-proto-google-cloud-firestore-admin-v1:3.21.0:3.21.1-SNAPSHOT
-proto-google-cloud-firestore-v1:3.21.0:3.21.1-SNAPSHOT
-proto-google-cloud-firestore-bundle-v1:3.21.0:3.21.1-SNAPSHOT
+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