diff --git a/Dockerfile b/Dockerfile
index 0b4286190..138c60d96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,8 @@
-FROM scratch
+FROM busybox
 
 ADD dist/docker/bin/ /
 
+EXPOSE 4150 4151 4160 4161 4170 4171
+
 VOLUME /data
 VOLUME /etc/ssl/certs
diff --git a/dist.sh b/dist.sh
index c120b53bd..480dbd099 100755
--- a/dist.sh
+++ b/dist.sh
@@ -49,3 +49,8 @@ for os in linux darwin; do
 done
 
 docker build -t nsqio/nsq:v$version .
+if [[ ! $version == *"-"* ]]
+then
+	echo "Tagging nsqio/nsq:v${version} as the latest release.";
+	docker tag -f nsqio/nsq:v$version nsqio/nsq:latest
+fi