diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index 0fe698655..023222a3a 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -16,8 +16,6 @@
 
 FROM golang:1.10
 WORKDIR /go/src/github.com/GoogleContainerTools/kaniko
-COPY . .
-RUN make
 # Get GCR credential helper
 ADD https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v1.4.3-static/docker-credential-gcr_linux_amd64-1.4.3.tar.gz /usr/local/bin/
 RUN tar -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-gcr_linux_amd64-1.4.3.tar.gz
@@ -25,6 +23,9 @@ RUN tar -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-gcr_linux_amd6
 RUN go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login
 RUN make -C /go/src/github.com/awslabs/amazon-ecr-credential-helper linux-amd64
 
+COPY . .
+RUN make
+
 FROM scratch
 COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/executor /kaniko/executor
 COPY --from=0 /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcr
diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug
index c8233ad37..c7292a20e 100644
--- a/deploy/Dockerfile_debug
+++ b/deploy/Dockerfile_debug
@@ -17,14 +17,14 @@
 # Stage 0: Build the executor binary and get credential helpers
 FROM golang:1.10
 WORKDIR /go/src/github.com/GoogleContainerTools/kaniko
-COPY . .
-RUN make
 # Get GCR credential helper
 ADD https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v1.4.3-static/docker-credential-gcr_linux_amd64-1.4.3.tar.gz /usr/local/bin/
 RUN tar -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-gcr_linux_amd64-1.4.3.tar.gz
 # Get Amazon ECR credential helper
 RUN go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login
 RUN make -C /go/src/github.com/awslabs/amazon-ecr-credential-helper linux-amd64 
+COPY . .
+RUN make
 
 # Stage 1: Get the busybox shell
 FROM gcr.io/cloud-builders/bazel:latest