diff --git a/docs/pom.xml b/docs/pom.xml
index ce174fd..b9577b0 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>Hoxton.BUILD-SNAPSHOT</version>
+		<version>Hoxton.SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Starter Docs</name>
diff --git a/pom.xml b/pom.xml
index 16dcbde..ec06819 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,11 @@
 	<packaging>pom</packaging>
 	<name>Spring Cloud Starter Build</name>
 	<description>Spring Cloud Starter Build</description>
-	<version>Hoxton.BUILD-SNAPSHOT</version>
+	<version>Hoxton.SNAPSHOT</version>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.1.BUILD-SNAPSHOT</version>
+		<version>2.3.1.SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml
index c1d3d8c..79f0af7 100644
--- a/spring-cloud-dependencies/pom.xml
+++ b/spring-cloud-dependencies/pom.xml
@@ -5,38 +5,38 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
-		<version>2.3.1.BUILD-SNAPSHOT</version>
+		<version>2.3.1.SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-dependencies</artifactId>
-	<version>Hoxton.BUILD-SNAPSHOT</version>
+	<version>Hoxton.SNAPSHOT</version>
 	<name>spring-cloud-dependencies</name>
 	<description>Spring Cloud Dependencies</description>
 	<packaging>pom</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud-aws.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-aws.version>
-		<spring-cloud-bus.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-build.version>2.3.1.BUILD-SNAPSHOT</spring-cloud-build.version>
-		<spring-cloud-cloudfoundry.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-cloudfoundry.version>
-		<spring-cloud-commons.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-circuitbreaker.version>1.0.4.BUILD-SNAPSHOT</spring-cloud-circuitbreaker.version>
-		<spring-cloud-config.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-consul.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-consul.version>
-		<spring-cloud-contract.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-function.version>3.0.7.RELEASE</spring-cloud-function.version>
-		<spring-cloud-gateway.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-gateway.version>
-		<spring-cloud-gcp.version>1.2.3.BUILD-SNAPSHOT</spring-cloud-gcp.version>
-		<spring-cloud-kubernetes.version>1.1.4.BUILD-SNAPSHOT</spring-cloud-kubernetes.version>
-		<spring-cloud-netflix.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
-		<spring-cloud-security.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-security.version>
-		<spring-cloud-sleuth.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-sleuth.version>
-		<spring-cloud-stream.version>Horsham.SR5</spring-cloud-stream.version>
+		<spring-cloud-aws.version>2.2.3.SNAPSHOT</spring-cloud-aws.version>
+		<spring-cloud-bus.version>2.2.3.SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-build.version>2.3.1.SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-cloudfoundry.version>2.2.3.SNAPSHOT</spring-cloud-cloudfoundry.version>
+		<spring-cloud-commons.version>2.2.4.SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-circuitbreaker.version>1.0.4.SNAPSHOT</spring-cloud-circuitbreaker.version>
+		<spring-cloud-config.version>2.2.4.SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-consul.version>2.2.4.SNAPSHOT</spring-cloud-consul.version>
+		<spring-cloud-contract.version>2.2.4.SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-function.version>3.0.8.RELEASE</spring-cloud-function.version>
+		<spring-cloud-gateway.version>2.2.4.SNAPSHOT</spring-cloud-gateway.version>
+		<spring-cloud-gcp.version>1.2.4.SNAPSHOT</spring-cloud-gcp.version>
+		<spring-cloud-kubernetes.version>1.1.4.SNAPSHOT</spring-cloud-kubernetes.version>
+		<spring-cloud-netflix.version>2.2.4.SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>2.2.4.SNAPSHOT</spring-cloud-openfeign.version>
+		<spring-cloud-security.version>2.2.3.SNAPSHOT</spring-cloud-security.version>
+		<spring-cloud-sleuth.version>2.2.4.SNAPSHOT</spring-cloud-sleuth.version>
+		<spring-cloud-stream.version>Horsham.SR6</spring-cloud-stream.version>
 		<spring-cloud-task.version>2.2.3.RELEASE</spring-cloud-task.version>
-		<spring-cloud-vault.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-vault.version>
-		<spring-cloud-zookeeper.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
-		<spring-cloud-cli.version>2.2.3.BUILD-SNAPSHOT</spring-cloud-cli.version>
+		<spring-cloud-vault.version>2.2.4.SNAPSHOT</spring-cloud-vault.version>
+		<spring-cloud-zookeeper.version>2.2.3.SNAPSHOT</spring-cloud-zookeeper.version>
+		<spring-cloud-cli.version>2.2.1.RELEASE</spring-cloud-cli.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml
index cb3ca11..cc0b6b9 100644
--- a/spring-cloud-starter-parent/pom.xml
+++ b/spring-cloud-starter-parent/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 	</parent>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-starter-parent</artifactId>
-	<version>Hoxton.BUILD-SNAPSHOT</version>
+	<version>Hoxton.SNAPSHOT</version>
 	<name>spring-cloud-starter-parent</name>
 	<description>Spring Cloud Starter Parent</description>
 	<packaging>pom</packaging>
@@ -20,7 +20,7 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+		<spring-cloud.version>Hoxton.SNAPSHOT</spring-cloud.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/train-docs/pom.xml b/train-docs/pom.xml
index 90c2362..132cdf6 100644
--- a/train-docs/pom.xml
+++ b/train-docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>Hoxton.BUILD-SNAPSHOT</version>
+		<version>Hoxton.SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Release Train Docs</name>
diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml
index cc367cd..fae5550 100644
--- a/train-docs/src/test/resources/test/pom.xml
+++ b/train-docs/src/test/resources/test/pom.xml
@@ -5,36 +5,36 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.3.1.SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-dependencies</artifactId>
-	<version>2020.0.0-SNAPSHOT</version>
+	<version>Hoxton.SNAPSHOT</version>
 	<name>spring-cloud-dependencies</name>
 	<description>Spring Cloud Dependencies</description>
 	<packaging>pom</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud-bus.version>1.2.3-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-build.version>3.0.0-SNAPSHOT</spring-cloud-build.version>
-		<spring-cloud-cloudfoundry.version>3.0.0-SNAPSHOT</spring-cloud-cloudfoundry.version>
-		<spring-cloud-commons.version>3.0.0-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-circuitbreaker.version>2.0.0-SNAPSHOT</spring-cloud-circuitbreaker.version>
-		<spring-cloud-config.version>3.0.0-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-consul.version>3.0.0-SNAPSHOT</spring-cloud-consul.version>
-		<spring-cloud-contract.version>3.0.0-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-function.version>3.1.0-SNAPSHOT</spring-cloud-function.version>
-		<spring-cloud-gateway.version>3.0.0-SNAPSHOT</spring-cloud-gateway.version>
-		<spring-cloud-kubernetes.version>2.0.0-SNAPSHOT</spring-cloud-kubernetes.version>
-		<spring-cloud-netflix.version>3.0.0-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>3.0.0-SNAPSHOT</spring-cloud-openfeign.version>
-		<spring-cloud-security.version>3.0.0-SNAPSHOT</spring-cloud-security.version>
-		<spring-cloud-sleuth.version>3.0.0-SNAPSHOT</spring-cloud-sleuth.version>
-		<spring-cloud-stream.version>3.1.0-SNAPSHOT</spring-cloud-stream.version>
-		<spring-cloud-task.version>2.3.0-SNAPSHOT</spring-cloud-task.version>
-		<spring-cloud-vault.version>3.0.0-SNAPSHOT</spring-cloud-vault.version>
-		<spring-cloud-zookeeper.version>3.0.0-SNAPSHOT</spring-cloud-zookeeper.version>
-		<spring-cloud-cli.version>3.0.0-SNAPSHOT</spring-cloud-cli.version>
+		<spring-cloud-bus.version>2.2.3.SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-build.version>2.3.1.SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-cloudfoundry.version>2.2.3.SNAPSHOT</spring-cloud-cloudfoundry.version>
+		<spring-cloud-commons.version>2.2.4.SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-circuitbreaker.version>1.0.4.SNAPSHOT</spring-cloud-circuitbreaker.version>
+		<spring-cloud-config.version>2.2.4.SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-consul.version>2.2.4.SNAPSHOT</spring-cloud-consul.version>
+		<spring-cloud-contract.version>2.2.4.SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-function.version>3.0.8.RELEASE</spring-cloud-function.version>
+		<spring-cloud-gateway.version>2.2.4.SNAPSHOT</spring-cloud-gateway.version>
+		<spring-cloud-kubernetes.version>1.1.4.SNAPSHOT</spring-cloud-kubernetes.version>
+		<spring-cloud-netflix.version>2.2.4.SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>2.2.4.SNAPSHOT</spring-cloud-openfeign.version>
+		<spring-cloud-security.version>2.2.3.SNAPSHOT</spring-cloud-security.version>
+		<spring-cloud-sleuth.version>2.2.4.SNAPSHOT</spring-cloud-sleuth.version>
+		<spring-cloud-stream.version>Horsham.SR6</spring-cloud-stream.version>
+		<spring-cloud-task.version>2.2.3.RELEASE</spring-cloud-task.version>
+		<spring-cloud-vault.version>2.2.4.SNAPSHOT</spring-cloud-vault.version>
+		<spring-cloud-zookeeper.version>2.2.3.SNAPSHOT</spring-cloud-zookeeper.version>
+		<spring-cloud-cli.version>2.2.1.RELEASE</spring-cloud-cli.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>