diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug
index 82c985a4a..688eb76a2 100644
--- a/deploy/Dockerfile_debug
+++ b/deploy/Dockerfile_debug
@@ -14,20 +14,32 @@
 
 # Builds the static Go image to execute in a Kubernetes job
 
+# Stage 0: Build the executor binary and get credential helpers
 FROM golang:1.10
 WORKDIR /go/src/github.com/GoogleContainerTools/kaniko
 COPY . .
 RUN make
-WORKDIR /usr/local/bin
-ADD https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v1.4.3-static/docker-credential-gcr_linux_amd64-1.4.3.tar.gz .
-RUN tar -xvzf /usr/local/bin/docker-credential-gcr_linux_amd64-1.4.3.tar.gz
+# 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 
+
+# Stage 1: Get the busybox shell
+FROM gcr.io/cloud-builders/bazel:latest
+RUN git clone https://github.com/GoogleContainerTools/distroless.git
+WORKDIR /distroless
+RUN bazel build busybox:busybox.tar
+RUN tar -C /distroless/bazel-genfiles/busybox/ -xf /distroless/bazel-genfiles/busybox/busybox.tar
 
 FROM scratch
 COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/executor /kaniko/executor
 COPY --from=0 /usr/local/bin/docker-credential-gcr /usr/local/bin/docker-credential-gcr
+COPY --from=0 /go/src/github.com/awslabs/amazon-ecr-credential-helper/bin/linux-amd64/docker-credential-ecr-login /usr/local/bin/docker-credential-ecr-login
+COPY --from=1 /distroless/bazel-genfiles/busybox/busybox/ /busybox/
 COPY files/ca-certificates.crt /kaniko/ssl/certs/
 COPY files/config.json /root/.docker/
-ADD files/busybox.tar /
 RUN ["docker-credential-gcr", "config", "--token-source=env"]
 ENV HOME /root
 ENV USER /root
diff --git a/deploy/executor-release.yaml b/deploy/executor-release.yaml
index 434a43e6f..5f20877c6 100644
--- a/deploy/executor-release.yaml
+++ b/deploy/executor-release.yaml
@@ -3,15 +3,7 @@ steps:
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile",
            "-t", "gcr.io/kaniko-project/executor:${COMMIT_SHA}", "."]
-  # Then, we want to clone the distroless repo and build busybox.tar
-  - name: "gcr.io/cloud-builders/git"
-    args: ["clone", "https://github.com/GoogleContainerTools/distroless.git"]
-  - name: "gcr.io/cloud-builders/bazel"
-    args: ["build", "busybox:busybox_tar"]
-    dir: distroless
-  - name: ubuntu
-    args: ["mv", "distroless/bazel-genfiles/busybox/busybox.tar", "files/busybox.tar"]
-  # Then, we want to build the kaniko:debug image with the busybox shell
+  # Then, we want to build kaniko:debug
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile_debug",
            "-t", "gcr.io/kaniko-project/executor:debug-${COMMIT_SHA}", "."]