diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 327fbd614..1f67c5f44 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,13 +22,13 @@
 	<name>Benchmarks</name>
 	<description>Benchmarks (JMH)</description>
 	<groupId>org.springframework.cloud</groupId>
-	<version>3.1.7</version>
+	<version>3.1.6-SNAPSHOT</version>
 	<artifactId>benchmarks</artifactId>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.14</version>
+		<version>2.6.13</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index 779af5d2b..5317282d8 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-sleuth-docs</artifactId>
 	<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 84fafd42b..a2abf745c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-sleuth</artifactId>
-	<version>3.1.7</version>
+	<version>3.1.6-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Sleuth</name>
 	<description>Spring Cloud Sleuth</description>
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -49,16 +49,16 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
 		<maven.compiler.testSource>1.8</maven.compiler.testSource>
-		<spring-cloud-build.version>3.1.6</spring-cloud-build.version>
-		<spring-cloud-commons.version>3.1.6</spring-cloud-commons.version>
-		<spring-cloud-gateway.version>3.1.6</spring-cloud-gateway.version>
-		<spring-cloud-config.version>3.1.6</spring-cloud-config.version>
-		<spring-cloud-circuitbreaker.version>2.1.6</spring-cloud-circuitbreaker.version>
-		<spring-cloud-stream.version>3.2.7</spring-cloud-stream.version>
-		<spring-cloud-function.version>3.2.9</spring-cloud-function.version>
-		<spring-cloud-netflix.version>3.1.5</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>3.1.6</spring-cloud-openfeign.version>
-		<spring-cloud-task.version>2.4.6</spring-cloud-task.version>
+		<spring-cloud-build.version>3.1.6-SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-commons.version>3.1.6-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-gateway.version>3.1.5-SNAPSHOT</spring-cloud-gateway.version>
+		<spring-cloud-config.version>3.1.6-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-circuitbreaker.version>2.1.6-SNAPSHOT</spring-cloud-circuitbreaker.version>
+		<spring-cloud-stream.version>3.2.7-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-function.version>3.2.9-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-netflix.version>3.1.5-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>3.1.6-SNAPSHOT</spring-cloud-openfeign.version>
+		<spring-cloud-task.version>2.4.6-SNAPSHOT</spring-cloud-task.version>
 		<spring-cloud-deployer.version>2.5.1</spring-cloud-deployer.version>
 		<brave.version>5.13.9</brave.version>
 		<opentracing.version>0.32.0</opentracing.version>
diff --git a/spring-cloud-sleuth-api/pom.xml b/spring-cloud-sleuth-api/pom.xml
index 2fe6232de..a8af6246a 100644
--- a/spring-cloud-sleuth-api/pom.xml
+++ b/spring-cloud-sleuth-api/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-autoconfigure/pom.xml b/spring-cloud-sleuth-autoconfigure/pom.xml
index 7c5bab0a8..af10cdf59 100644
--- a/spring-cloud-sleuth-autoconfigure/pom.xml
+++ b/spring-cloud-sleuth-autoconfigure/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-brave/pom.xml b/spring-cloud-sleuth-brave/pom.xml
index 6e5e8f37b..36d28ee05 100644
--- a/spring-cloud-sleuth-brave/pom.xml
+++ b/spring-cloud-sleuth-brave/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-dependencies/.flattened-pom.xml b/spring-cloud-sleuth-dependencies/.flattened-pom.xml
index 4af0f97c5..23e93f39c 100644
--- a/spring-cloud-sleuth-dependencies/.flattened-pom.xml
+++ b/spring-cloud-sleuth-dependencies/.flattened-pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-dependencies-parent</artifactId>
-    <version>3.1.6</version>
+    <version>3.1.3</version>
     <relativePath></relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-sleuth-dependencies</artifactId>
-  <version>3.1.7</version>
+  <version>3.1.3</version>
   <packaging>pom</packaging>
   <name>spring-cloud-sleuth-dependencies</name>
   <description>Spring Cloud Sleuth Dependencies</description>
@@ -95,7 +95,7 @@
     </snapshotRepository>
     <site>
       <id>spring-docs</id>
-      <url>https:/docs.spring.io/spring-cloud-dependencies-parent/docs/3.1.6/reference/html/spring-cloud-sleuth-dependencies/</url>
+      <url>https:/docs.spring.io/spring-cloud-dependencies-parent/docs/3.1.3/reference/html/spring-cloud-sleuth-dependencies/</url>
     </site>
     <downloadUrl>https://github.com/spring-cloud</downloadUrl>
   </distributionManagement>
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index acc234758..04552a7ba 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -22,11 +22,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.6</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-	<version>3.1.7</version>
+	<version>3.1.6-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
diff --git a/spring-cloud-sleuth-instrumentation/pom.xml b/spring-cloud-sleuth-instrumentation/pom.xml
index 6845c4536..6208e1e19 100644
--- a/spring-cloud-sleuth-instrumentation/pom.xml
+++ b/spring-cloud-sleuth-instrumentation/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 0a19a21e2..b1ee48370 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
index df57a337e..d4cb1e778 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
index c61c9d192..0501a0326 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
index 1f03e1b8e..edc3e6f42 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
index 0f255f58a..87f95b563 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
index 9450e2a48..7ddba1570 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
index 5c0282fef..f771001ce 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index 943c29b10..b460464e7 100644
--- a/spring-cloud-sleuth-zipkin/pom.xml
+++ b/spring-cloud-sleuth-zipkin/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml
index ce0c89a83..c6b2097c8 100644
--- a/spring-cloud-starter-sleuth/pom.xml
+++ b/spring-cloud-starter-sleuth/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-sleuth</artifactId>
diff --git a/tests/brave/pom.xml b/tests/brave/pom.xml
index 48d87c206..f447d5064 100644
--- a/tests/brave/pom.xml
+++ b/tests/brave/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-actuator-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-actuator-tests/pom.xml
index bba6a4910..499fdd607 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-actuator-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-actuator-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml
index 56c54a5ea..bf13be07f 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
index 9913e2915..e33f753ce 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml
index a788bc2b1..7e062d93d 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/pom.xml
index 5c7f20c52..54298ec7f 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-batch-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/pom.xml
index 9079cc870..bb5db4bf8 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-reactive-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml
index fb602bd01..db0a33a86 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-config-server-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-config-server-tests/pom.xml
index 296700ea8..bce24ad05 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-config-server-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-config-server-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
index 232074e37..6a85160b1 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml
index b1febc9ce..79fdafbc0 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
index 1b0dd5ba1..f51ff696e 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/pom.xml
index 32dafdc91..e5393bfcf 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-jdbc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-kafka-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-kafka-tests/pom.xml
index def6b8c92..2d0e2c576 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-kafka-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-kafka-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml
index 394f0ee14..d0e48516f 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
index a81f87866..86e56707f 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
index a6d70337b..98d4ee9ad 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-mongodb-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-mongodb-tests/pom.xml
index 41d63902b..5e4b1cbe1 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-mongodb-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-mongodb-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
index 8850c1f32..88206ca39 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml
index bc8d9f024..102e93a9f 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-r2dbc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-r2dbc-tests/pom.xml
index e418f5f7b..41194e965 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-r2dbc-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-r2dbc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
index 9616c9c36..474dc6f3f 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-rsocket-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-rsocket-tests/pom.xml
index 693aa47f5..fab943a37 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-rsocket-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-rsocket-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
index 4ff7660ab..0cf1f238e 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
index 800ab5c77..82220b1fb 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-security-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-security-tests/pom.xml
index f75744718..137538100 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-security-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-security-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-task-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-task-tests/pom.xml
index 53f79c9fd..6115b0431 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-task-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-task-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
index a56328dfa..e3efe30ec 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml b/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml
index 1fe9a969a..b9307d199 100644
--- a/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml
+++ b/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/common/pom.xml b/tests/common/pom.xml
index 59d9432b9..c608d4662 100644
--- a/tests/common/pom.xml
+++ b/tests/common/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index 15b857578..9402b59fa 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.6-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>