diff --git a/docs/pom.xml b/docs/pom.xml
index 0649d9b5..9ffb6688 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-consul-docs</artifactId>
 	<packaging>pom</packaging>
diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc
index 0ac98584..824b3992 100644
--- a/docs/src/main/asciidoc/_configprops.adoc
+++ b/docs/src/main/asciidoc/_configprops.adoc
@@ -21,7 +21,6 @@
 |spring.cloud.consul.discovery.default-query-tag |  | Tag to query for in service list if one is not listed in serverListQueryTags.
 |spring.cloud.consul.discovery.default-zone-metadata-name | zone | Service instance zone comes from metadata. This allows changing the metadata tag name.
 |spring.cloud.consul.discovery.deregister | true | Disable automatic de-registration of service in consul.
-|spring.cloud.consul.discovery.enable-tag-override |  | Enable tag override for the registered service.
 |spring.cloud.consul.discovery.enabled | true | Is service discovery enabled?
 |spring.cloud.consul.discovery.fail-fast | true | Throw exceptions during service registration if true, otherwise, log warnings (defaults to true).
 |spring.cloud.consul.discovery.health-check-critical-timeout |  | Timeout to deregister services critical for longer than timeout (e.g. 30m). Requires consul version 7.x or higher.
@@ -41,12 +40,9 @@
 |spring.cloud.consul.discovery.instance-zone |  | Service instance zone.
 |spring.cloud.consul.discovery.ip-address |  | IP address to use when accessing service (must also set preferIpAddress to use).
 |spring.cloud.consul.discovery.lifecycle.enabled | true | 
-|spring.cloud.consul.discovery.management-enable-tag-override |  | Enable tag override for the registered management service.
-|spring.cloud.consul.discovery.management-metadata |  | Metadata to use when registering management service.
 |spring.cloud.consul.discovery.management-port |  | Port to register the management service under (defaults to management port).
 |spring.cloud.consul.discovery.management-suffix | management | Suffix to use when registering management service.
 |spring.cloud.consul.discovery.management-tags |  | Tags to use when registering management service.
-|spring.cloud.consul.discovery.metadata |  | Metadata to use when registering service.
 |spring.cloud.consul.discovery.order | 0 | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients.
 |spring.cloud.consul.discovery.port |  | Port to register the service under (defaults to listening port).
 |spring.cloud.consul.discovery.prefer-agent-address | false | Source of how we will determine the address to use.
diff --git a/pom.xml b/pom.xml
index 17ef04f4..e6c74b98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-consul</artifactId>
-	<version>3.0.0.M1</version>
+	<version>3.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Consul</name>
 	<description>Spring Cloud Consul</description>
@@ -14,19 +14,19 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
-		<spring-cloud-bus.version>3.0.0.M1</spring-cloud-bus.version>
-		<spring-cloud-commons.version>3.0.0.M1</spring-cloud-commons.version>
-		<spring-cloud-config.version>3.0.0.M1</spring-cloud-config.version>
-		<spring-cloud-netflix.version>3.0.0.M1</spring-cloud-netflix.version>
+		<spring-cloud-bus.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-commons.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-netflix.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<spring-cloud-deployer.version>1.0.3.RELEASE</spring-cloud-deployer.version>
-		<spring-cloud-openfeign.version>3.0.0.M1</spring-cloud-openfeign.version>
-		<spring-cloud-stream.version>3.1.0.M1</spring-cloud-stream.version>
+		<spring-cloud-openfeign.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
+		<spring-cloud-stream.version>Horsham.BUILD-SNAPSHOT</spring-cloud-stream.version>
 	</properties>
 
 	<scm>
diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml
index 14f08333..c54f9bf7 100644
--- a/spring-cloud-consul-binder/pom.xml
+++ b/spring-cloud-consul-binder/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml
index decae4a3..0995baf6 100644
--- a/spring-cloud-consul-config/pom.xml
+++ b/spring-cloud-consul-config/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml
index 1257c11a..5c79a192 100644
--- a/spring-cloud-consul-core/pom.xml
+++ b/spring-cloud-consul-core/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml
index 72c10593..8d76820d 100644
--- a/spring-cloud-consul-dependencies/pom.xml
+++ b/spring-cloud-consul-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-consul-dependencies</artifactId>
-	<version>3.0.0.M1</version>
+	<version>3.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-consul-dependencies</name>
 	<description>Spring Cloud Consul Dependencies</description>
diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml
index 209cd3b7..e5911b2b 100644
--- a/spring-cloud-consul-discovery/pom.xml
+++ b/spring-cloud-consul-discovery/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml
index 8c36f477..a0155f7a 100644
--- a/spring-cloud-consul-sample/pom.xml
+++ b/spring-cloud-consul-sample/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml
index 71615ece..bcb1094b 100644
--- a/spring-cloud-starter-consul-all/pom.xml
+++ b/spring-cloud-starter-consul-all/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul-all</artifactId>
diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml
index 6a58e422..e17c5b6d 100644
--- a/spring-cloud-starter-consul-bus/pom.xml
+++ b/spring-cloud-starter-consul-bus/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul-bus</artifactId>
diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml
index 61847b86..d19358e6 100644
--- a/spring-cloud-starter-consul-config/pom.xml
+++ b/spring-cloud-starter-consul-config/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul-config</artifactId>
diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml
index 7a113d68..c3ec7089 100644
--- a/spring-cloud-starter-consul-discovery/pom.xml
+++ b/spring-cloud-starter-consul-discovery/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul-discovery</artifactId>
diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml
index 4d45566f..38a8357d 100644
--- a/spring-cloud-starter-consul/pom.xml
+++ b/spring-cloud-starter-consul/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-consul</artifactId>
-		<version>3.0.0.M1</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-consul</artifactId>