diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index 5d811327e..0323d5d34 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -15,10 +15,10 @@
 # Builds the static Go image to execute in a Kubernetes job
 
 FROM scratch
-ADD out/executor /kaniko/executor
-ADD files/ca-certificates.crt /kaniko/ssl/certs/
-ADD files/docker-credential-gcr /usr/local/bin/
-ADD files/config.json /root/.docker/
+COPY out/executor /kaniko/executor
+COPY files/ca-certificates.crt /kaniko/ssl/certs/
+COPY files/docker-credential-gcr /usr/local/bin/
+COPY files/config.json /root/.docker/
 RUN ["docker-credential-gcr", "config", "--token-source=env"]
 ENV HOME /root
 ENV USER /root
diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug
index a7af94fe5..29ecbeef9 100644
--- a/deploy/Dockerfile_debug
+++ b/deploy/Dockerfile_debug
@@ -15,11 +15,11 @@
 # Builds the executor from debian
 
 FROM gcr.io/google-appengine/debian9:latest
-ADD out/executor /kaniko/executor
-ADD files/ca-certificates.crt /kaniko/ssl/certs/
-ADD files/docker-credential-gcr /usr/local/bin/
-ADD files/config.json /root/.docker/
+COPY out/executor /kaniko/executor
+COPY files/ca-certificates.crt /kaniko/ssl/certs/
+COPY files/docker-credential-gcr /usr/local/bin/
+COPY files/config.json /root/.docker/
+RUN ["docker-credential-gcr", "config", "--token-source=env"]
 ENV HOME /root
 ENV SSL_CERT_DIR=/kaniko/ssl/certs
-RUN ["docker-credential-gcr", "config", "--token-source=env"]
 ENTRYPOINT ["/kaniko/executor"]
diff --git a/deploy/executor-release.yaml b/deploy/executor-release.yaml
index db3d5c5de..6344ebdff 100644
--- a/deploy/executor-release.yaml
+++ b/deploy/executor-release.yaml
@@ -18,13 +18,14 @@ steps:
       path: "/usr/bin"
     dir: go/src/github.com/GoogleContainerTools/kaniko
     env: ["GOPATH=/workspace/go/"]
-  # Then, build kaniko with kaniko
-  - name: "gcr.io/kaniko-project/executor:latest"
-    args: ["--dockerfile=/workspace/deploy/Dockerfile",
-           "--context=/workspace/go/src/github.com/GoogleContainerTools/kaniko/",
-           "--destination=gcr.io/kaniko-project/executor:${COMMIT_SHA}"]
+  # First, build kaniko
+  - name: "gcr.io/cloud-builders/docker"
+    args: ["build", "-f", "deploy/Dockerfile",
+           "-t", "gcr.io/kaniko-project/executor:${COMMIT_SHA}", "."]
+    dir: go/src/github.com/GoogleContainerTools/kaniko  
   # Then, build kaniko:debug
-  - name: "gcr.io/kaniko-project/executor:latest"
-    args: ["--dockerfile=/workspace/deploy/Dockerfile_debug",
-           "--context=/workspace/go/src/github.com/GoogleContainerTools/kaniko/",
-           "--destination=gcr.io/kaniko-project/executor:debug-${COMMIT_SHA}"]
+  - name: "gcr.io/cloud-builders/docker"
+    args: ["build", "-f", "deploy/Dockerfile_debug",
+           "-t", "gcr.io/kaniko-project/executor:debug-${COMMIT_SHA}", "."] 
+    dir: go/src/github.com/GoogleContainerTools/kaniko
+images: ["gcr.io/kaniko-project/executor:${COMMIT_SHA}", "gcr.io/kaniko-project/executor:debug-${COMMIT_SHA}"]