diff --git a/pom.xml b/pom.xml
index b630aca..986b0ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <bintray.package>cli</bintray.package>
         <docs.main>spring-cloud-cli</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<spring-boot.version>2.0.0.BUILD-SNAPSHOT</spring-boot.version>
+		<spring-boot.version>2.0.0.RC2</spring-boot.version>
 		<spring-cloud.version>Finchley.BUILD-SNAPSHOT</spring-cloud.version>
 	</properties>
 	<modules>
diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/java/org/springframework/cloud/launcher/zipkin/ZipkinServerApplication.java b/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/java/org/springframework/cloud/launcher/zipkin/ZipkinServerApplication.java
index 643c95a..2430c38 100644
--- a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/java/org/springframework/cloud/launcher/zipkin/ZipkinServerApplication.java
+++ b/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/java/org/springframework/cloud/launcher/zipkin/ZipkinServerApplication.java
@@ -26,22 +26,18 @@ import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import zipkin.collector.CollectorMetrics;
 import zipkin.collector.CollectorSampler;
 import zipkin.internal.V2StorageComponent;
-import zipkin.server.ZipkinQueryApiV1;
-import zipkin.server.ZipkinServerConfiguration;
-import zipkin.server.brave.BraveConfiguration;
+import zipkin.server.EnableZipkinServer;
 import zipkin.storage.StorageComponent;
 import zipkin2.storage.InMemoryStorage;
 
 /**
  * @author Spencer Gibb
  */
-// @EnableZipkinServer
-@Import({ZipkinServerConfiguration.class, BraveConfiguration.class, ZipkinQueryApiV1.class})
+@EnableZipkinServer
 @EnableDiscoveryClient
 @SpringBootApplication
 public class ZipkinServerApplication {