diff --git a/Dockerfile b/Dockerfile
index 5e64e95..0f68e43 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,28 +13,27 @@ RUN apk --update \
     rm -rf /tmp/glibc-2.21-r2.apk /var/cache/apk/*
 
 # The Consul binary
-ADD https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip /tmp/consul.zip
+ADD https://releases.hashicorp.com/consul/0.6.0/consul_0.6.0_linux_amd64.zip /tmp/consul.zip
 RUN cd /bin && \
     unzip /tmp/consul.zip && \
     chmod +x /bin/consul && \
     rm /tmp/consul.zip
 
 # The Consul web UI
-ADD https://dl.bintray.com/mitchellh/consul/0.5.2_web_ui.zip /tmp/webui.zip
+ADD https://releases.hashicorp.com/consul/0.6.0/consul_0.6.0_web_ui.zip /tmp/webui.zip
 RUN mkdir /ui && \
     cd /ui && \
     unzip /tmp/webui.zip && \
-    rm /tmp/webui.zip && \
-    mv dist/* . && \
-    rm -rf dist
+    rm /tmp/webui.zip
 
 # get Containerbuddy release
-RUN export CB=containerbuddy-0.0.1-alpha &&\
+RUN export CB=containerbuddy-0.0.5-alpha &&\
     mkdir -p /opt/containerbuddy && \
     curl -Lo /tmp/${CB}.tar.gz \
-    https://github.com/joyent/containerbuddy/releases/download/0.0.1-alpha/${CB}.tar.gz && \
-	tar xzf /tmp/${CB}.tar.gz -C /tmp && \
-    mv /tmp/build/containerbuddy /opt/containerbuddy/
+    https://github.com/joyent/containerbuddy/releases/download/0.0.5/containerbuddy-0.0.5.tar.gz && \
+    tar xzf /tmp/${CB}.tar.gz -C /tmp && \
+    rm /tmp/${CB}.tar.gz && \
+    mv /tmp/containerbuddy /opt/containerbuddy/
 COPY containerbuddy.json /etc/
 
 # Consul config