diff --git a/pkg/docker/Dockerfile-trusty b/pkg/docker/Dockerfile-trusty
index 15937e0e..53dead45 100644
--- a/pkg/docker/Dockerfile-trusty
+++ b/pkg/docker/Dockerfile-trusty
@@ -9,6 +9,6 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /stackdriver-metadata.deb
 
-CMD /opt/stackdriver/metadata/sbin/metadatad
+ENTRYPOINT ["/opt/stackdriver/metadata/sbin/metadatad"]
 
 EXPOSE 8000
diff --git a/pkg/docker/Dockerfile-xenial b/pkg/docker/Dockerfile-xenial
index e689caea..8d5941c8 100644
--- a/pkg/docker/Dockerfile-xenial
+++ b/pkg/docker/Dockerfile-xenial
@@ -10,6 +10,6 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /stackdriver-metadata.deb
 
-CMD /opt/stackdriver/metadata/sbin/metadatad
+ENTRYPOINT ["/opt/stackdriver/metadata/sbin/metadatad"]
 
 EXPOSE 8000