diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug
new file mode 100644
index 000000000..a7af94fe5
--- /dev/null
+++ b/deploy/Dockerfile_debug
@@ -0,0 +1,25 @@
+# Copyright 2018 Google, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# 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/
+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 c733962ba..db3d5c5de 100644
--- a/deploy/executor-release.yaml
+++ b/deploy/executor-release.yaml
@@ -23,3 +23,8 @@ steps:
     args: ["--dockerfile=/workspace/deploy/Dockerfile",
            "--context=/workspace/go/src/github.com/GoogleContainerTools/kaniko/",
            "--destination=gcr.io/kaniko-project/executor:${COMMIT_SHA}"]
+  # 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}"]