diff --git a/deploy/cloudbuild-release.yaml b/deploy/cloudbuild-release.yaml
index 9cd2ad9f88..35f968be69 100644
--- a/deploy/cloudbuild-release.yaml
+++ b/deploy/cloudbuild-release.yaml
@@ -16,7 +16,10 @@ steps:
            "-t", "gcr.io/kaniko-project/executor:debug-$TAG_NAME", "."]
   - name: "gcr.io/cloud-builders/docker"
     args: ["tag", "gcr.io/kaniko-project/executor:debug-$TAG_NAME", 
-           "gcr.io/kaniko-project/executor:debug"]
+           "gcr.io/kaniko-project/executor:$TAG_NAME-debug"]
+  - name: "gcr.io/cloud-builders/docker"
+    args: ["tag", "gcr.io/kaniko-project/executor:debug-$TAG_NAME", 
+           "gcr.io/kaniko-project/executor:debug"]       
   # Then, we want to build the cache warmer
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile_warmer",
@@ -96,4 +99,5 @@ images: ["gcr.io/kaniko-project/executor:$TAG_NAME",
          "gcr.io/kaniko-project/executor:debug-$TAG_NAME",
          "gcr.io/kaniko-project/executor:debug",
          "gcr.io/kaniko-project/warmer:$TAG_NAME",
-         "gcr.io/kaniko-project/warmer:latest"]
+         "gcr.io/kaniko-project/warmer:latest",
+         "gcr.io/kaniko-project/executor:$TAG_NAME-debug"]
diff --git a/deploy/cloudbuild.yaml b/deploy/cloudbuild.yaml
index bc2d165da9..d745b5fd29 100644
--- a/deploy/cloudbuild.yaml
+++ b/deploy/cloudbuild.yaml
@@ -12,7 +12,7 @@ steps:
            "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:debug-${COMMIT_SHA}", "."]
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile_debug",
-           "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:debug", "."]
+           "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:${COMMIT_SHA}-debug", "."]
   # Then, we want to build the cache warmer
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile_warmer",