diff --git a/deploy/cloudbuild-release.yaml b/deploy/cloudbuild-release.yaml
index a86b0b0da0..ee5b1d694b 100644
--- a/deploy/cloudbuild-release.yaml
+++ b/deploy/cloudbuild-release.yaml
@@ -14,7 +14,16 @@ steps:
   - 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",
+           "-t", "gcr.io/kaniko-project/warmer:$TAG_NAME", "."]
+  - name: "gcr.io/cloud-builders/docker"
+    args: ["tag", "gcr.io/kaniko-project/warmer:$TAG_NAME", 
+           "gcr.io/kaniko-project/warmer:latest"]
 images: ["gcr.io/kaniko-project/executor:$TAG_NAME",
          "gcr.io/kaniko-project/executor:latest",
          "gcr.io/kaniko-project/executor:debug-$TAG_NAME",
-         "gcr.io/kaniko-project/executor:debug"]
+         "gcr.io/kaniko-project/executor:debug",
+         "gcr.io/kaniko-project/warmer:$TAG_NAME",
+         "gcr.io/kaniko-project/warmer:latest"]
diff --git a/deploy/cloudbuild.yaml b/deploy/cloudbuild.yaml
index 6e2e074afa..e01b52390f 100644
--- a/deploy/cloudbuild.yaml
+++ b/deploy/cloudbuild.yaml
@@ -13,7 +13,16 @@ steps:
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile_debug",
            "-t", "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",
+           "-t", "gcr.io/kaniko-project/warmer:${COMMIT_SHA}", "."]
+  - name: "gcr.io/cloud-builders/docker"
+    args: ["build", "-f", "deploy/Dockerfile_warmer",
+           "-t", "gcr.io/kaniko-project/warmer:latest", "."]
 images: ["gcr.io/kaniko-project/executor:${COMMIT_SHA}",
          "gcr.io/kaniko-project/executor:latest",
          "gcr.io/kaniko-project/executor:debug-${COMMIT_SHA}",
-         "gcr.io/kaniko-project/executor:debug"]
+         "gcr.io/kaniko-project/executor:debug",
+         "gcr.io/kaniko-project/warmer:${COMMIT_SHA}",
+         "gcr.io/kaniko-project/warmer:latest"]