diff --git a/consul-agent/Dockerfile b/0.5/consul-agent/Dockerfile
similarity index 86%
rename from consul-agent/Dockerfile
rename to 0.5/consul-agent/Dockerfile
index 163b463..928adc8 100644
--- a/consul-agent/Dockerfile
+++ b/0.5/consul-agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM gliderlabs/consul:latest
+FROM gliderlabs/consul:0.5
 ADD ./config /config/
 EXPOSE 8300 8301 8301/udp 8302 8302/udp 8400 8500 8600 8600/udp
 ENV DNS_RESOLVES consul
diff --git a/consul-agent/Makefile b/0.5/consul-agent/Makefile
similarity index 100%
rename from consul-agent/Makefile
rename to 0.5/consul-agent/Makefile
diff --git a/consul-agent/config/agent.json b/0.5/consul-agent/config/agent.json
similarity index 100%
rename from consul-agent/config/agent.json
rename to 0.5/consul-agent/config/agent.json
diff --git a/consul-server/Dockerfile b/0.5/consul-server/Dockerfile
similarity index 86%
rename from consul-server/Dockerfile
rename to 0.5/consul-server/Dockerfile
index eb3237d..aa5174c 100644
--- a/consul-server/Dockerfile
+++ b/0.5/consul-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM gliderlabs/consul-agent:latest
+FROM gliderlabs/consul:0.5
 ADD ./config /config/
 ADD https://dl.bintray.com/mitchellh/consul/0.5.2_web_ui.zip /tmp/webui.zip
 RUN cd /tmp && unzip webui.zip && mv dist /ui && rm webui.zip
diff --git a/consul-server/Makefile b/0.5/consul-server/Makefile
similarity index 100%
rename from consul-server/Makefile
rename to 0.5/consul-server/Makefile
diff --git a/consul-server/config/server.json b/0.5/consul-server/config/server.json
similarity index 100%
rename from consul-server/config/server.json
rename to 0.5/consul-server/config/server.json
diff --git a/consul/Dockerfile b/0.5/consul/Dockerfile
similarity index 99%
rename from consul/Dockerfile
rename to 0.5/consul/Dockerfile
index d830ec5..f1c2c0e 100644
--- a/consul/Dockerfile
+++ b/0.5/consul/Dockerfile
@@ -1,10 +1,8 @@
 FROM alpine:3.2
-
 RUN apk --update add curl ca-certificates && \
     curl -Ls https://circle-artifacts.com/gh/andyshinn/alpine-pkg-glibc/6/artifacts/0/home/ubuntu/alpine-pkg-glibc/packages/x86_64/glibc-2.21-r2.apk > /tmp/glibc-2.21-r2.apk && \
     apk add --allow-untrusted /tmp/glibc-2.21-r2.apk && \
     rm -rf /tmp/glibc-2.21-r2.apk /var/cache/apk/*
-
 ADD https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip /tmp/consul.zip
 RUN cd /bin && unzip /tmp/consul.zip && chmod +x /bin/consul && rm /tmp/consul.zip
 
diff --git a/consul/Makefile b/0.5/consul/Makefile
similarity index 100%
rename from consul/Makefile
rename to 0.5/consul/Makefile