diff --git a/scripts/build-docker b/scripts/build-docker
index 37931f4ac..986032ec1 100755
--- a/scripts/build-docker
+++ b/scripts/build-docker
@@ -6,7 +6,7 @@ FROM scratch
 ADD etcd /
 ADD etcdctl /
 EXPOSE 4001 7001 2379 2380
-CMD ["/etcd"]
+ENTRYPOINT ["/etcd"]
 DF
 
-docker build .
+docker build -t quay.io/coreos/etcd:${1} .