diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 27c69e4cf..78e4baef3 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,7 +22,7 @@
 	<name>Benchmarks</name>
 	<description>Benchmarks (JMH)</description>
 	<groupId>org.springframework.cloud</groupId>
-	<version>2.2.5.BUILD-SNAPSHOT</version>
+	<version>2.2.5.RELEASE</version>
 	<artifactId>benchmarks</artifactId>
 
 	<properties>
@@ -32,7 +32,7 @@
 		<sonar.skip>true</sonar.skip>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
-		<spring-boot.version>2.3.2.RELEASE</spring-boot.version>
+		<spring-boot.version>2.3.3.RELEASE</spring-boot.version>
 		<brave.version>5.12.3</brave.version>
 		<okhttp.version>3.14.6</okhttp.version>
 	</properties>
diff --git a/docs/pom.xml b/docs/pom.xml
index d83073176..6fdb023d1 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-sleuth-docs</artifactId>
 	<packaging>pom</packaging>
diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc
index 56cb52a46..acd5c66ad 100644
--- a/docs/src/main/asciidoc/_configprops.adoc
+++ b/docs/src/main/asciidoc/_configprops.adoc
@@ -6,13 +6,18 @@
 |spring.sleuth.async.enabled | true | Enable instrumenting async related components so that the tracing information is passed between threads.
 |spring.sleuth.async.ignored-beans |  | List of {@link java.util.concurrent.Executor} bean names that should be ignored and not wrapped in a trace representation.
 |spring.sleuth.baggage-keys |  | List of baggage key names that should be propagated out of process. These keys will be prefixed with `baggage` before the actual key. This property is set in order to be backward compatible with previous Sleuth versions. @see brave.propagation.ExtraFieldPropagation.FactoryBuilder#addPrefixedFields(String, java.util.Collection)
+|spring.sleuth.baggage.correlation-enabled | true | Adds a {@link CorrelationScopeDecorator} to put baggage values into the correlation context.
+|spring.sleuth.baggage.correlation-fields |  | A list of {@link BaggageField#name() fields} to add to correlation (MDC) context. @see CorrelationScopeConfig.SingleCorrelationField#create(BaggageField)
+|spring.sleuth.baggage.local-fields |  | Same as {@link #remoteFields} except that this field is not propagated to remote services. @see BaggagePropagationConfig.SingleBaggageField#local(BaggageField)
+|spring.sleuth.baggage.remote-fields |  | List of fields that are referenced the same in-process as it is on the wire. For example, the field "x-vcap-request-id" would be set as-is including the prefix. @see BaggagePropagationConfig.SingleBaggageField#remote(BaggageField) @see BaggagePropagationConfig.SingleBaggageField.Builder#addKeyName(String)
+|spring.sleuth.baggage.tag-fields |  | A list of {@link BaggageField#name() fields} to tag into the span. @see Tags#BAGGAGE_FIELD
 |spring.sleuth.circuitbreaker.enabled | true | Enable Spring Cloud CircuitBreaker instrumentation.
 |spring.sleuth.enabled | true | 
 |spring.sleuth.feign.enabled | true | Enable span information propagation when using Feign.
 |spring.sleuth.feign.processor.enabled | true | Enable post processor that wraps Feign Context in its tracing representations.
 |spring.sleuth.grpc.enabled | true | Enable span information propagation when using GRPC.
 |spring.sleuth.http.enabled | true | 
-|spring.sleuth.http.legacy.enabled | false | 
+|spring.sleuth.http.legacy.enabled | false | Enables the legacy Sleuth setup.
 |spring.sleuth.hystrix.strategy.enabled | true | Enable custom HystrixConcurrencyStrategy that wraps all Callable instances into their Sleuth representative - the TraceCallable.
 |spring.sleuth.hystrix.strategy.passthrough | false | When enabled the tracing information is passed to the Hystrix execution threads but spans are not created for each execution.
 |spring.sleuth.integration.enabled | true | Enable Spring Integration sleuth instrumentation.
diff --git a/pom.xml b/pom.xml
index 242d23e82..12ddd3935 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-sleuth</artifactId>
-	<version>2.2.5.BUILD-SNAPSHOT</version>
+	<version>2.2.5.RELEASE</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>2.3.2.BUILD-SNAPSHOT</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -251,15 +251,15 @@
 		<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-commons.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-gateway.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-gateway.version>
-		<spring-cloud-circuitbreaker.version>1.0.5.BUILD-SNAPSHOT</spring-cloud-circuitbreaker.version>
-		<spring-cloud-stream.version>Horsham.SR7</spring-cloud-stream.version>
-		<spring-cloud-netflix.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
+		<spring-cloud-commons.version>2.2.5.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-gateway.version>2.2.5.RELEASE</spring-cloud-gateway.version>
+		<spring-cloud-circuitbreaker.version>1.0.4.RELEASE</spring-cloud-circuitbreaker.version>
+		<spring-cloud-stream.version>Horsham.SR8</spring-cloud-stream.version>
+		<spring-cloud-netflix.version>2.2.5.RELEASE</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>2.2.5.RELEASE</spring-cloud-openfeign.version>
 		<brave.version>5.12.3</brave.version>
 		<spring-security-boot-autoconfigure.version>2.1.7.RELEASE</spring-security-boot-autoconfigure.version>
-		<spring-cloud-aws.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-aws.version>
+		<spring-cloud-aws.version>2.2.4.RELEASE</spring-cloud-aws.version>
 		<disable.nohttp.checks>false</disable.nohttp.checks>
 		<okhttp.version>3.14.6</okhttp.version>
 		<mockwebserver.version>3.14.6</mockwebserver.version>
diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml
index ed4e23e34..6518b7240 100644
--- a/spring-cloud-sleuth-core/pom.xml
+++ b/spring-cloud-sleuth-core/pom.xml
@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-dependencies/.flattened-pom.xml b/spring-cloud-sleuth-dependencies/.flattened-pom.xml
new file mode 100644
index 000000000..18d709393
--- /dev/null
+++ b/spring-cloud-sleuth-dependencies/.flattened-pom.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2013-2018 the original author or authors.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-dependencies-parent</artifactId>
+    <version>2.3.1.RELEASE</version>
+    <relativePath></relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-sleuth-dependencies</artifactId>
+  <version>2.2.5.RELEASE</version>
+  <packaging>pom</packaging>
+  <name>spring-cloud-sleuth-dependencies</name>
+  <description>Spring Cloud Sleuth Dependencies</description>
+  <url>https://projects.spring.io/spring-cloud/spring-cloud-sleuth-dependencies/</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				https://www.apache.org/licenses/LICENSE-2.0
+
+				Unless required by applicable law or agreed to in writing, software
+				distributed under the License is distributed on an "AS IS" BASIS,
+				WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+				implied.
+
+				See the License for the specific language governing permissions and
+				limitations under the License.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>Project lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>Project lead</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-sleuth-dependencies</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-sleuth-dependencies</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-build/spring-cloud-sleuth-dependencies</url>
+  </scm>
+  <distributionManagement>
+    <repository>
+      <id>repo.spring.io</id>
+      <name>Spring Release Repository</name>
+      <url>https://repo.spring.io/libs-release-local</url>
+    </repository>
+    <snapshotRepository>
+      <id>repo.spring.io</id>
+      <name>Spring Snapshot Repository</name>
+      <url>https://repo.spring.io/libs-snapshot-local</url>
+    </snapshotRepository>
+    <site>
+      <id>spring-docs</id>
+      <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/spring-cloud-dependencies-parent/2.3.1.RELEASE/spring-cloud-sleuth-dependencies</url>
+    </site>
+    <downloadUrl>https://github.com/spring-cloud</downloadUrl>
+  </distributionManagement>
+  <properties>
+    <brave.opentracing.version>0.37.2</brave.opentracing.version>
+    <grpc.spring.boot.version>3.4.1</grpc.spring.boot.version>
+    <brave.version>5.12.3</brave.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-sleuth-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-starter-zipkin</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-starter-sleuth</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.zipkin.brave</groupId>
+        <artifactId>brave-bom</artifactId>
+        <version>${brave.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.opentracing.brave</groupId>
+        <artifactId>brave-opentracing</artifactId>
+        <version>${brave.opentracing.version}</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>*</artifactId>
+            <groupId>io.zipkin.brave</groupId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>io.github.lognet</groupId>
+        <artifactId>grpc-spring-boot-starter</artifactId>
+        <version>${grpc.spring.boot.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <profiles>
+    <profile>
+      <id>spring</id>
+      <repositories>
+        <repository>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <id>spring-snapshots</id>
+          <name>Spring Snapshots</name>
+          <url>https://repo.spring.io/libs-snapshot-local</url>
+        </repository>
+        <repository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/libs-milestone-local</url>
+        </repository>
+        <repository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-releases</id>
+          <name>Spring Releases</name>
+          <url>https://repo.spring.io/release</url>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <id>spring-snapshots</id>
+          <name>Spring Snapshots</name>
+          <url>https://repo.spring.io/libs-snapshot-local</url>
+        </pluginRepository>
+        <pluginRepository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/libs-milestone-local</url>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+</project>
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index fb5358e98..794801297 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>2.3.2.BUILD-SNAPSHOT</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-	<version>2.2.5.BUILD-SNAPSHOT</version>
+	<version>2.2.5.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 87a09254f..bb231a266 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</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 3fa6a01ad..970e71af3 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</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 7616ec434..a03716369 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
index 89a2b4c5b..0d6526d8e 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</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 5409bce84..65541f00e 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</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 4232425b9..ce99cfed7 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</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 b1c7238e7..49b24a5f9 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</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 41ea639aa..f990531c4 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index 3f13b116e..a5b1ab95c 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml
index f556b6c16..251a15b65 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-sleuth</artifactId>
diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml
index 33d2f14e3..cfedfcd53 100644
--- a/spring-cloud-starter-zipkin/pom.xml
+++ b/spring-cloud-starter-zipkin/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-zipkin</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 66e355060..435505f2b 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>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
index 6086f0065..d76781805 100644
--- a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
index ca1937f09..28be97735 100644
--- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
index 6fc1ec1c3..9775d81bd 100644
--- a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml
index f780c9b73..0eae558c4 100644
--- a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
index 818964f0e..45286568b 100644
--- a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
index a54944b7d..4f9f6a56a 100644
--- a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
@@ -31,7 +31,7 @@ https://www.w3.org/2001/XMLSchema-instance ">
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
index a80c5fac8..fe6a2bc7d 100644
--- a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
index ade9dae94..ffaff0274 100644
--- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml
index 7f9550136..a8c957c9c 100644
--- a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
index ed940a294..fed018ec4 100644
--- a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
index defd15858..af0fbd27d 100644
--- a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
index fcf3cdca6..1614f808a 100644
--- a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml
index 15b0d0009..d003cb7e5 100644
--- a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-tests</artifactId>
-		<version>2.2.5.BUILD-SNAPSHOT</version>
+		<version>2.2.5.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>