diff --git a/Dockerfile b/Dockerfile
index 705e943..5480d03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,24 @@
 FROM openjdk:8
 
-ENV DRUID_VERSION 0.16.0-incubating
-ENV ZOOKEEPER_VERSION 3.4.14
+ENV DRUID_VERSION 0.20.0
+ENV ZOOKEEPER_VERSION 3.5.8
 
 # Get Druid
 RUN mkdir -p /tmp \
     && cd /tmp/ \
-    && curl -fsLS "https://www.apache.org/dyn/closer.cgi?filename=/incubator/druid/$DRUID_VERSION/apache-druid-$DRUID_VERSION-bin.tar.gz&action=download" | tar xvz \
+    && curl -fsLS "https://downloads.apache.org/druid/$DRUID_VERSION/apache-druid-$DRUID_VERSION-bin.tar.gz" | tar xvz \
     && mv apache-druid-$DRUID_VERSION /opt/druid
 
 WORKDIR /opt/druid/
 
 # Zookeeper
-RUN curl -fsLS "https://www.apache.org/dyn/closer.cgi?filename=/zookeeper/zookeeper-$ZOOKEEPER_VERSION/zookeeper-$ZOOKEEPER_VERSION.tar.gz&action=download" | tar xvz \
-    && mv zookeeper-$ZOOKEEPER_VERSION zk
+RUN curl -fsLS "https://downloads.apache.org/zookeeper/zookeeper-$ZOOKEEPER_VERSION/apache-zookeeper-$ZOOKEEPER_VERSION-bin.tar.gz" | tar xvz \
+    && mv apache-zookeeper-$ZOOKEEPER_VERSION-bin zk
 
 ADD config/common.runtime.properties conf/druid/single-server/micro-quickstart/_common/common.runtime.properties
 
+ADD config/mysql-connector-java-5.1.46.jar extensions/mysql-metadata-storage/mysql-connector-java-5.1.46.jar
+
 RUN bash -c "./bin/start-micro-quickstart &" && \
     ./bin/post-index-task --file quickstart/tutorial/wikipedia-index.json --url http://localhost:8081 --submit-timeout 600
 
@@ -25,13 +27,13 @@ RUN bash -c "./bin/start-micro-quickstart &" && \
 # - 8081: HTTP (coordinator)
 # - 8082: HTTP (broker)
 # - 8083: HTTP (historical)
-# - 8090: HTTP (overlord)
+# - 8091: HTTP (middlemanager)
 # - 2181 2888 3888: ZooKeeper
 EXPOSE 8888
 EXPOSE 8081
 EXPOSE 8082
 EXPOSE 8083
-EXPOSE 8090
+EXPOSE 8091
 EXPOSE 2181 2888 3888
 
 ENTRYPOINT ./bin/start-micro-quickstart
diff --git a/config/common.runtime.properties b/config/common.runtime.properties
index b3b6dd1..3465b73 100644
--- a/config/common.runtime.properties
+++ b/config/common.runtime.properties
@@ -55,16 +55,16 @@ druid.zk.paths.base=/druid
 #
 
 # For Derby server on your Druid Coordinator (only viable in a cluster with a single Coordinator, no fail-over):
-druid.metadata.storage.type=derby
-druid.metadata.storage.connector.connectURI=jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
-druid.metadata.storage.connector.host=localhost
-druid.metadata.storage.connector.port=1527
+# druid.metadata.storage.type=derby
+# druid.metadata.storage.connector.connectURI=jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
+# druid.metadata.storage.connector.host=localhost
+# druid.metadata.storage.connector.port=1527
 
 # For MySQL (make sure to include the MySQL JDBC driver on the classpath):
-#druid.metadata.storage.type=mysql
-#druid.metadata.storage.connector.connectURI=jdbc:mysql://db.example.com:3306/druid
-#druid.metadata.storage.connector.user=...
-#druid.metadata.storage.connector.password=...
+druid.metadata.storage.type=mysql
+druid.metadata.storage.connector.connectURI=jdbc:mysql://db.example.com:3306/druid
+druid.metadata.storage.connector.user=...
+druid.metadata.storage.connector.password=...
 
 # For PostgreSQL:
 #druid.metadata.storage.type=postgresql
diff --git a/config/mysql-connector-java-5.1.46.jar b/config/mysql-connector-java-5.1.46.jar
new file mode 100644
index 0000000..2553237
Binary files /dev/null and b/config/mysql-connector-java-5.1.46.jar differ