diff --git a/v1/pom.xml b/v1/pom.xml
index 066fb45272..e0c69cb78c 100644
--- a/v1/pom.xml
+++ b/v1/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-spanner-bom</artifactId>
-            <version>6.45.3</version>
+            <version>6.58.0</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
diff --git a/v2/pom.xml b/v2/pom.xml
index 223a79d5bb..22621d9d50 100644
--- a/v2/pom.xml
+++ b/v2/pom.xml
@@ -88,13 +88,13 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Test -->
+        <!-- hamcrest is needed at runtime for beam-io-gcp -->
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
-            <scope>test</scope>
         </dependency>
+        <!-- Test -->
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>