diff --git a/README.adoc b/README.adoc
index 26b7a1c03..1198274d8 100644
--- a/README.adoc
+++ b/README.adoc
@@ -492,13 +492,6 @@ dependencies { <2>
 If you want to use RabbitMQ or Kafka instead of HTTP, add the `spring-rabbit` or `spring-kafka` dependency.
 The default destination name is `zipkin`.
 
-If using Kafka, you must set the property `spring.zipkin.sender.type` property accordingly:
-
-[source,yaml]
-----
-spring.zipkin.sender.type: kafka
-----
-
 CAUTION: `spring-cloud-sleuth-stream` is deprecated and incompatible with these destinations.
 
 If you want Sleuth over RabbitMQ, add the `spring-cloud-starter-zipkin` and `spring-rabbit`
@@ -604,8 +597,8 @@ Consequently, if you set  a baggage element on a Span, it is sent downstream to
 * If `spring-cloud-sleuth-zipkin` is on the classpath, the app generates and collects Zipkin-compatible traces.
 By default, it sends them over HTTP to a Zipkin server on localhost (port 9411).
 You can configure the location of the service by setting `spring.zipkin.baseUrl`.
-** If you depend on `spring-rabbit`, your app sends traces to a RabbitMQ broker instead of HTTP.
-** If you depend on `spring-kafka`, and set `spring.zipkin.sender.type: kafka`, your app sends traces to a Kafka broker instead of HTTP.
+** If you depend on `spring-rabbit` or `spring-kafka`, your app sends traces to a broker instead of HTTP.
+**
 
 CAUTION: `spring-cloud-sleuth-stream` is deprecated and should no longer be used.
 
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 3d151b5b2..982342aef 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.0.1.RELEASE</version>
+	<version>2.0.1.BUILD-SNAPSHOT</version>
 	<artifactId>benchmarks</artifactId>
 
 	<properties>
@@ -33,7 +33,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.0.4.RELEASE</spring-boot.version>
+		<spring-boot.version>2.0.3.RELEASE</spring-boot.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/docs/pom.xml b/docs/pom.xml
index dca982666..a6f54258b 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>2.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-sleuth-docs</artifactId>
 	<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 6ba5d800a..2a9c95795 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-sleuth</artifactId>
-	<version>2.0.1.RELEASE</version>
+	<version>2.0.1.BUILD-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>2.0.3.RELEASE</version>
+		<version>2.0.2.RELEASE</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -268,11 +268,11 @@
 		<maven.compiler.testSource>1.8</maven.compiler.testSource>
 		<surefire.plugin.version>2.19.1</surefire.plugin.version>
 		<checkstyle.version>2.17</checkstyle.version>
-		<spring-cloud-build.version>2.0.3.RELEASE</spring-cloud-build.version>
-		<spring-cloud-commons.version>2.0.1.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-stream.version>Elmhurst.SR1</spring-cloud-stream.version>
-		<spring-cloud-netflix.version>2.0.1.RELEASE</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>2.0.1.RELEASE</spring-cloud-openfeign.version>
+		<spring-cloud-build.version>2.0.2.RELEASE</spring-cloud-build.version>
+		<spring-cloud-commons.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-stream.version>Elmhurst.BUILD-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-netflix.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
 		<brave.version>5.1.4</brave.version>
 		<spring-security-boot-autoconfigure.version>2.0.0.RELEASE</spring-security-boot-autoconfigure.version>
 	</properties>
diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml
index de7a30584..583312c80 100644
--- a/spring-cloud-sleuth-core/pom.xml
+++ b/spring-cloud-sleuth-core/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 7e2aba032..4c7ad9ebb 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -21,11 +21,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.3.RELEASE</version>
+		<version>2.0.2.BUILD-SNAPSHOT</version>
         <relativePath/>
 	</parent>
 	<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-	<version>2.0.1.RELEASE</version>
+	<version>2.0.1.BUILD-SNAPSHOT</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 cd049f506..3097c344a 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.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-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 a7d11354d..62b2261b4 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
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-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 92b347e5b..1711f7c15 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.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-SNAPSHOT</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 7deb4a7c6..7ded51954 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.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-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 c70528c67..402c28886 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.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-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 27fd906f4..93ae73dae 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.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-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 2f6341ee6..55eb448f6 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
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-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 53945d270..fc745c03a 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.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index 42765d770..2014643b4 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.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml
index 6e874ab7f..5d12cc9d9 100644
--- a/spring-cloud-starter-sleuth/pom.xml
+++ b/spring-cloud-starter-sleuth/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-SNAPSHOT</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 358b96851..c228e58dc 100644
--- a/spring-cloud-starter-zipkin/pom.xml
+++ b/spring-cloud-starter-zipkin/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.0.1.RELEASE</version>
+		<version>2.0.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-zipkin</artifactId>