diff --git a/docker-compose-cassandra.yml b/docker-compose-cassandra.yml
index 1fd7a74..c598fcf 100644
--- a/docker-compose-cassandra.yml
+++ b/docker-compose-cassandra.yml
@@ -9,14 +9,14 @@ version: '2'
 services:
   # Run Cassandra instead of MySQL
   storage:
-    image: openzipkin/zipkin-cassandra:1.17.0
+    image: openzipkin/zipkin-cassandra:1.18.0
     container_name: cassandra
     ports:
       - 9042:9042
 
   # Switch storage type to Cassandra
   zipkin:
-    image: openzipkin/zipkin:1.17.0
+    image: openzipkin/zipkin:1.18.0
     environment:
       - STORAGE_TYPE=cassandra
       # When overriding this value, note the minimum supported version is 2.2
diff --git a/docker-compose-elasticsearch.yml b/docker-compose-elasticsearch.yml
index c58c9e1..39ff69f 100644
--- a/docker-compose-elasticsearch.yml
+++ b/docker-compose-elasticsearch.yml
@@ -9,7 +9,7 @@ version: '2'
 services:
   # Run Elasticsearch instead of MySQL
   storage:
-    image: openzipkin/zipkin-elasticsearch:1.17.0
+    image: openzipkin/zipkin-elasticsearch:1.18.0
     container_name: elasticsearch
     ports:
       # http
@@ -17,7 +17,7 @@ services:
 
   # Switch storage type to Elasticsearch
   zipkin:
-    image: openzipkin/zipkin:1.17.0
+    image: openzipkin/zipkin:1.18.0
     environment:
       - STORAGE_TYPE=elasticsearch
       # Point the zipkin at the storage backend
diff --git a/docker-compose-kafka.yml b/docker-compose-kafka.yml
index c2ce487..e4198b5 100644
--- a/docker-compose-kafka.yml
+++ b/docker-compose-kafka.yml
@@ -9,7 +9,7 @@ version: '2'
 services:
   kafka-zookeeper:
     build: kafka
-    image: openzipkin/zipkin-kafka:1.17.0
+    image: openzipkin/zipkin-kafka:1.18.0
     container_name: kafka-zookeeper
     environment:
       # corresponds to your docker machine and your producer's broker list
diff --git a/docker-compose-legacy.yml b/docker-compose-legacy.yml
index c23c38b..c2186d0 100644
--- a/docker-compose-legacy.yml
+++ b/docker-compose-legacy.yml
@@ -6,7 +6,7 @@
 # wire the containers together.
 
 storage:
-  image: openzipkin/zipkin-cassandra:1.17.0
+  image: openzipkin/zipkin-cassandra:1.18.0
   ports:
     - 9042:9042
 
@@ -14,7 +14,7 @@ storage:
 # instrumentation can send trace data to. Scribe is enabled by default.
 # It can also poll kafka, when the KAFKA_ZOOKEEPER variable is set.
 zipkin:
-  image: openzipkin/zipkin:1.17.0
+  image: openzipkin/zipkin:1.18.0
   environment:
     - STORAGE_TYPE=cassandra
     # Uncomment to enable self-tracing
diff --git a/docker-compose-ui.yml b/docker-compose-ui.yml
index c5c6501..60689a0 100644
--- a/docker-compose-ui.yml
+++ b/docker-compose-ui.yml
@@ -8,7 +8,7 @@ version: '2'
 
 services:
   zipkin-ui:
-    image: openzipkin/zipkin-ui:1.17.0
+    image: openzipkin/zipkin-ui:1.18.0
     container_name: zipkin-ui
     ports:
       - 80:80
diff --git a/docker-compose.yml b/docker-compose.yml
index 98655c6..d0a8b3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ version: '2'
 
 services:
   storage:
-    image: openzipkin/zipkin-mysql:1.17.0
+    image: openzipkin/zipkin-mysql:1.18.0
     container_name: mysql
     ports:
       - 3306:3306
@@ -18,9 +18,9 @@ services:
   # The zipkin process services the UI, and also exposes a POST endpoint that
   # instrumentation can send trace data to. Scribe is enabled by default.
   zipkin:
-    image: openzipkin/zipkin:1.17.0
+    image: openzipkin/zipkin:1.18.0
     container_name: zipkin
-    # Environment settings are defined here https://github.com/openzipkin/zipkin/tree/1.17.0/zipkin-server#environment-variables
+    # Environment settings are defined here https://github.com/openzipkin/zipkin/tree/1.18.0/zipkin-server#environment-variables
     environment:
       - STORAGE_TYPE=mysql
       # Point the zipkin at the storage backend