diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5071cd98..8b6955d57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+### [2.5.1](https://www.github.com/googleapis/java-firestore/compare/v2.5.0...v2.5.1) (2021-06-22)
+
+
+### Bug Fixes
+
+* return results from getPartitions() in order ([#653](https://www.github.com/googleapis/java-firestore/issues/653)) ([12d17d1](https://www.github.com/googleapis/java-firestore/commit/12d17d1ac9d7a1c21eca1469164b079de4476633))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-conformance-tests to v0.1.1 ([#650](https://www.github.com/googleapis/java-firestore/issues/650)) ([b93ca8a](https://www.github.com/googleapis/java-firestore/commit/b93ca8a2b5751c61b3fbe0ca608056e2c0398575))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.3.0 ([#660](https://www.github.com/googleapis/java-firestore/issues/660)) ([0f13fd0](https://www.github.com/googleapis/java-firestore/commit/0f13fd0c0db0208b9f68a57dabcb1e998b4a7b9b))
+
 ## [2.5.0](https://www.github.com/googleapis/java-firestore/compare/v2.4.0...v2.5.0) (2021-06-01)
 
 
diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml
index 2944d3a95..48f940aec 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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+  <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
+    <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml
index 94dd5b4cc..595127e76 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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
+  <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -63,37 +63,37 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore</artifactId>
-        <version>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-        <version>2.5.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>2.5.1</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
-        <version>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>2.5.1</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-firestore-admin</artifactId>
-        <version>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
+        <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
index 302fd4f5a..bfb17b1fd 100644
--- a/google-cloud-firestore/pom.xml
+++ b/google-cloud-firestore/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</artifactId>
-  <version>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+  <version>2.5.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>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-firestore-parent</artifactId>
-    <version>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
+    <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-parent: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 fe5d1b48e..846e7b4c8 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>2.5.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+    <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
+        <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml
index 7b282b853..0a269fc6a 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>2.5.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+    <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
+        <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 13ff0c576..2dc41352c 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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
+  <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
   <name>Google Cloud Firestore Parent</name>
   <url>https://github.com/googleapis/java-firestore</url>
   <description>
@@ -159,27 +159,27 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
-        <version>2.5.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+        <version>2.5.1</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
-        <version>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+        <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+        <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
+        <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
+        <version>2.5.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 a2cda646a..7f2a3dfcf 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>2.5.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
+    <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
+        <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-parent: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 2e2119e85..f289d108f 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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
+    <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
+        <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml
index 9248e6899..c8b9c7d04 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>2.5.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
+    <version>2.5.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>2.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
+        <version>2.5.1</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
     </parent>
     <dependencies>
         <dependency>
diff --git a/versions.txt b/versions.txt
index 31ce16ef0..e7e076bb2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,11 +1,11 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-firestore:2.5.0:2.5.1-SNAPSHOT
-google-cloud-firestore-admin:2.5.0:2.5.1-SNAPSHOT
-google-cloud-firestore-bom:2.5.0:2.5.1-SNAPSHOT
-google-cloud-firestore-parent:2.5.0:2.5.1-SNAPSHOT
-grpc-google-cloud-firestore-admin-v1:2.5.0:2.5.1-SNAPSHOT
-grpc-google-cloud-firestore-v1:2.5.0:2.5.1-SNAPSHOT
-proto-google-cloud-firestore-admin-v1:2.5.0:2.5.1-SNAPSHOT
-proto-google-cloud-firestore-v1:2.5.0:2.5.1-SNAPSHOT
+google-cloud-firestore:2.5.1:2.5.1
+google-cloud-firestore-admin:2.5.1:2.5.1
+google-cloud-firestore-bom:2.5.1:2.5.1
+google-cloud-firestore-parent:2.5.1:2.5.1
+grpc-google-cloud-firestore-admin-v1:2.5.1:2.5.1
+grpc-google-cloud-firestore-v1:2.5.1:2.5.1
+proto-google-cloud-firestore-admin-v1:2.5.1:2.5.1
+proto-google-cloud-firestore-v1:2.5.1:2.5.1