diff --git a/docker/Dockerfile b/docker/Dockerfile
index ec6893637cb..91f009c64c1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -44,9 +44,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 RUN pip install cqlsh
 
-ENV GOLANG_VERSION 1.10.1
+ENV GOLANG_VERSION 1.11.1
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 72d820dec546752e5a8303b33b009079c15c2390ce76d67cf514991646c6127b
+ENV GOLANG_DOWNLOAD_SHA256 2871270d8ff0c8c69f161aaae42f9f28739855ff5c5204752a8d92a1c9f63993
 
 RUN set -eux; \
     wget -O golang.tar.gz "$GOLANG_DOWNLOAD_URL" \
@@ -61,7 +61,7 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 # get and compile cadence-server
 ENV CADENCE_HOME $GOPATH/src/github.com/uber/cadence
 
-RUN go get -u github.com/Masterminds/glide
+RUN go get -u github.com/golang/dep/cmd/dep
 RUN go get -u github.com/golang/lint/golint
 
 RUN git clone https://github.com/uber/cadence.git $CADENCE_HOME
diff --git a/docker/config_template.yaml b/docker/config_template.yaml
index eebb2507d9a..a9b086d61d5 100644
--- a/docker/config_template.yaml
+++ b/docker/config_template.yaml
@@ -2,12 +2,21 @@ log:
   stdout: true
   level: "${LOG_LEVEL}"
 
-cassandra:
-  hosts: "${CASSANDRA_SEEDS}"
-  keyspace: "${KEYSPACE}"
-  visibilityKeyspace: "${VISIBILITY_KEYSPACE}"
-  consistency: "${CASSANDRA_CONSISTENCY}"
+persistence:
+  defaultStore: cass-default
+  visibilityStore: cass-visibility
   numHistoryShards: ${NUM_HISTORY_SHARDS}
+  datastores:
+    cass-default:
+      cassandra:
+        hosts: "${CASSANDRA_SEEDS}"
+        keyspace: "${KEYSPACE}"
+        consistency: "${CASSANDRA_CONSISTENCY}"
+    cass-visibility:
+      cassandra:
+        hosts: "${CASSANDRA_SEEDS}"
+        keyspace: "${VISIBILITY_KEYSPACE}"
+        consistency: "${CASSANDRA_CONSISTENCY}"
 
 ringpop:
   name: cadence
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 58b00d59a9f..7c0a7d48078 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - "8125:8125"
       - "8126:8126"
   cadence:
-    image: ubercadence/server:0.3.15
+    image: ubercadence/server:0.4.0
     ports:
      - "7933:7933"
      - "7934:7934"
diff --git a/docker/start.sh b/docker/start.sh
index 79757c44460..9e24c2fdc67 100644
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -89,7 +89,7 @@ init_env() {
     fi
 
     if [ -z "$LOG_LEVEL" ]; then
-        export LOG_LEVEL="debug"
+        export LOG_LEVEL="info"
     fi
 }