diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 34b4558fb..94bec773a 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -16,8 +16,8 @@
 	<properties>
 		<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<aspectj.version>1.8.4</aspectj.version>
-		<zipkin-java.version>0.10.4</zipkin-java.version>
-		<zipkin-ui.version>1.39.0</zipkin-ui.version>
+		<zipkin-java.version>0.11.0</zipkin-java.version>
+		<zipkin-ui.version>1.39.3</zipkin-ui.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -85,7 +85,7 @@
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
-				<artifactId>spanstore-jdbc</artifactId>
+				<artifactId>storage-jdbc</artifactId>
 				<version>${zipkin-java.version}</version>
 			</dependency>
 			<dependency>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 180d10ed2..bcbd9eaf9 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -59,12 +59,12 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>0.10.4</version>
+				<version>0.11.0</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>0.10.4</version>
+				<version>0.11.0</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
index 47d138b7d..8f68c6f8b 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
@@ -35,7 +35,7 @@
 	<properties>
 		<docker.image.prefix>springio</docker.image.prefix>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<zipkin-ui.version>1.39.0</zipkin-ui.version>
+		<zipkin-ui.version>1.39.3</zipkin-ui.version>
 		<java.version>1.8</java.version>
 		<sonar.skip>true</sonar.skip>
 	</properties>
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml
index c08ce888e..9b9419f40 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml
@@ -1,18 +1,22 @@
-storage:
-  image: openzipkin/zipkin-mysql:1.39.0
-  container_name: mysql
-  ports:
-    - 3306:3306
-query:
-  image: openzipkin/zipkin-java:0.10.4
-  environment:
-    - STORAGE_TYPE=mysql
-    - MYSQL_HOST=mysql
-    - MYSQL_PORT=3306
-  ports:
-    # Historical port used for the Zipkin HTTP Api
-    - 9411:9411
-    # Zipkin UI used to be on a separate process listening on port 8080
-    - 8080:9411
-  links:
-    - storage
+version: '2'
+
+services:
+  storage:
+    image: openzipkin/zipkin-mysql:1.39.3
+    container_name: mysql
+    ports:
+      - 3306:3306
+  query:
+    image: openzipkin/zipkin-java:0.11.0
+    environment:
+      - STORAGE_TYPE=mysql
+      - MYSQL_HOST=mysql
+    ports:
+      # Listen port for the Scribe transport
+      - 9410:9410
+      # Historical port used for the Zipkin HTTP Api
+      - 9411:9411
+      # Zipkin UI used to be on a separate process listening on port 8080
+      - 8080:9411
+    depends_on:
+      - storage
diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml
index 2e7ba48ca..bb5321093 100644
--- a/spring-cloud-sleuth-zipkin-stream/pom.xml
+++ b/spring-cloud-sleuth-zipkin-stream/pom.xml
@@ -63,7 +63,7 @@
 		</dependency>
 		<dependency>
 			<groupId>io.zipkin.java</groupId>
-			<artifactId>spanstore-jdbc</artifactId>
+			<artifactId>storage-jdbc</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
diff --git a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java
index d398ddeb4..5f745cc16 100644
--- a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java
+++ b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java
@@ -33,12 +33,12 @@ import org.springframework.integration.annotation.MessageEndpoint;
 import org.springframework.integration.annotation.ServiceActivator;
 
 import zipkin.Annotation;
+import zipkin.AsyncSpanConsumer;
 import zipkin.BinaryAnnotation;
 import zipkin.BinaryAnnotation.Type;
 import zipkin.Endpoint;
 import zipkin.Sampler;
 import zipkin.Span.Builder;
-import zipkin.async.AsyncSpanConsumer;
 
 /**
  * A message listener that is turned on if Sleuth Stream is disabled.
diff --git a/spring-cloud-sleuth-zipkin/docker-compose.yml b/spring-cloud-sleuth-zipkin/docker-compose.yml
index ce943f6c8..9b9419f40 100644
--- a/spring-cloud-sleuth-zipkin/docker-compose.yml
+++ b/spring-cloud-sleuth-zipkin/docker-compose.yml
@@ -1,15 +1,22 @@
-mysql:
-  image: openzipkin/zipkin-mysql:1.38.1
-  ports:
-    - 3306:3306
-query:
-  image: openzipkin/zipkin-java:0.9.3
-  environment:
-    - STORAGE_TYPE=mysql
-  ports:
-    # Historical port used for the Zipkin HTTP Api
-    - 9411:9411
-    # Zipkin UI used to be on a separate process listening on port 8080
-    - 8080:9411
-  links:
-    - mysql:storage
+version: '2'
+
+services:
+  storage:
+    image: openzipkin/zipkin-mysql:1.39.3
+    container_name: mysql
+    ports:
+      - 3306:3306
+  query:
+    image: openzipkin/zipkin-java:0.11.0
+    environment:
+      - STORAGE_TYPE=mysql
+      - MYSQL_HOST=mysql
+    ports:
+      # Listen port for the Scribe transport
+      - 9410:9410
+      # Historical port used for the Zipkin HTTP Api
+      - 9411:9411
+      # Zipkin UI used to be on a separate process listening on port 8080
+      - 8080:9411
+    depends_on:
+      - storage
diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java
index 67b03a193..692969c94 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java
@@ -121,7 +121,7 @@ public class ZipkinSpanListener implements SpanReporter {
 		String serviceName = span.tags().containsKey(Span.SPAN_PEER_SERVICE_TAG_NAME) ?
 				span.tags().get(Span.SPAN_PEER_SERVICE_TAG_NAME) : this.endpointLocator.local().serviceName;
 		zipkinSpan.addBinaryAnnotation(BinaryAnnotation.address(Constants.SERVER_ADDR,
-				Endpoint.create(serviceName, this.endpointLocator.local().ipv4, this.endpointLocator.local().port)));
+				new Endpoint.Builder(this.endpointLocator.local()).serviceName(serviceName).build()));
 	}
 
 	private boolean notClientOrServer(Span span) {