diff --git a/Dockerfile-release b/Dockerfile-release
index d9ef07514fc..bf6d190e62e 100644
--- a/Dockerfile-release
+++ b/Dockerfile-release
@@ -6,5 +6,5 @@ RUN mkdir -p /var/etcd/
 
 EXPOSE 2379 2380
 
-# Define default command.
-CMD ["/usr/local/bin/etcd"]
+# Define default entrypoint.
+ENTRYPOINT ["/usr/local/bin/etcd"]