diff --git a/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile b/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile
index 0a07ace3ec9..bec10526d3c 100644
--- a/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile
+++ b/vertical-pod-autoscaler/pkg/admission-controller/Dockerfile
@@ -17,4 +17,5 @@ MAINTAINER Tomasz Kulczynski "tkulczynski@google.com"
 
 ADD admission-controller admission-controller
 
-ENTRYPOINT ./admission-controller --v=4 --stderrthreshold=info
+ENTRYPOINT ["./admission-controller"]
+CMD ["--v=4", "--stderrthreshold=info"]
diff --git a/vertical-pod-autoscaler/pkg/updater/Dockerfile b/vertical-pod-autoscaler/pkg/updater/Dockerfile
index 8f578b88a66..d8a65b921f4 100644
--- a/vertical-pod-autoscaler/pkg/updater/Dockerfile
+++ b/vertical-pod-autoscaler/pkg/updater/Dockerfile
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 FROM k8s.gcr.io/debian-base-amd64:1.0.0
 MAINTAINER Marcin Wielgus "mwielgus@google.com"
 
 ADD updater updater
 
-ENTRYPOINT ./updater --v=4 --stderrthreshold=info
+ENTRYPOINT ["./updater"]
+CMD ["--v=4", "--stderrthreshold=info"]