diff --git a/deploy/cloudbuild-debug-release.yaml b/deploy/cloudbuild-debug-release.yaml
deleted file mode 100644
index 3f7ab52fd..000000000
--- a/deploy/cloudbuild-debug-release.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-timeout: 1800s
-
-steps:
-# Set up builder for muti-arch builds.
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['run', '--privileged', 'linuxkit/binfmt:v0.7']
-  id: 'initialize-qemu'
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['buildx', 'create', '--use', '--platform', '${_DOCKER_BUILDX_PLATFORMS}']
-  id: 'create-builder'
-
-# Build kaniko:debug
-- name: "gcr.io/cloud-builders/docker"
-  args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile_debug",
-         "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:$TAG_NAME-debug",
-         "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:debug", "--push", "."]
-
-options:
-  env:
-  - 'DOCKER_CLI_EXPERIMENTAL=enabled'
-
-substitutions:
-  _EXECUTOR_IMAGE_NAME: executor
-  _DOCKER_BUILDX_PLATFORMS: 'linux/amd64,linux/arm64'
\ No newline at end of file
diff --git a/deploy/cloudbuild-debug.yaml b/deploy/cloudbuild-debug.yaml
deleted file mode 100644
index c7cf478ea..000000000
--- a/deploy/cloudbuild-debug.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-timeout: 1800s
-
-steps:
-  # Set up builder for muti-arch builds.
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['run', '--privileged', 'linuxkit/binfmt:v0.7']
-    id: 'initialize-qemu'
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['buildx', 'create', '--use', '--platform', '${_DOCKER_BUILDX_PLATFORMS}']
-    id: 'create-builder'
-
-  # Then, we want to build kaniko:debug
-  - name: "gcr.io/cloud-builders/docker"
-    args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile_debug",
-           "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:$COMMIT_SHA-debug",
-           "--push", "."]
-
-
-options:
-  env:
-  - 'DOCKER_CLI_EXPERIMENTAL=enabled'
-
-substitutions:
-  _EXECUTOR_IMAGE_NAME: executor
-  _DOCKER_BUILDX_PLATFORMS: 'linux/arm64'
diff --git a/deploy/cloudbuild-executor-release.yaml b/deploy/cloudbuild-executor-release.yaml
deleted file mode 100644
index 19d3e3277..000000000
--- a/deploy/cloudbuild-executor-release.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-timeout: 1800s
-
-steps:
-# Set up builder for muti-arch builds.
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['run', '--privileged', 'linuxkit/binfmt:v0.7']
-  id: 'initialize-qemu'
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['buildx', 'create', '--use', '--platform', '${_DOCKER_BUILDX_PLATFORMS}']
-  id: 'create-builder'
-
-# First, build kaniko
-- name: "gcr.io/cloud-builders/docker"
-  args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile",
-         "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:$TAG_NAME",
-         "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:latest", "--push", "."]
-
-# Finally executor:slim image
-- name: "gcr.io/cloud-builders/docker"
-  args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile_slim",
-         "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:$TAG_NAME-slim",
-         "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:slim", "--push", "."]
-
-options:
-  env:
-  - 'DOCKER_CLI_EXPERIMENTAL=enabled'
-
-substitutions:
-  _EXECUTOR_IMAGE_NAME: executor
-  _DOCKER_BUILDX_PLATFORMS: 'linux/amd64,linux/arm64'
\ No newline at end of file
diff --git a/deploy/cloudbuild-executor.yaml b/deploy/cloudbuild-executor.yaml
deleted file mode 100644
index cd5af0c71..000000000
--- a/deploy/cloudbuild-executor.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-timeout: 1800s
-
-steps:
-  # Set up builder for muti-arch builds.
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['run', '--privileged', 'linuxkit/binfmt:v0.7']
-    id: 'initialize-qemu'
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['buildx', 'create', '--use', '--platform', '${_DOCKER_BUILDX_PLATFORMS}']
-    id: 'create-builder'
-
-  # First, build kaniko
-  - name: "gcr.io/cloud-builders/docker"
-    args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile",
-           "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:$COMMIT_SHA", "--push", "." ]
-
-  # Finally executor:slim image
-  - name: "gcr.io/cloud-builders/docker"
-    args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile_slim",
-           "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:$COMMIT_SHA-slim", "--push", "."]
-
-options:
-  env:
-  - 'DOCKER_CLI_EXPERIMENTAL=enabled'
-
-substitutions:
-  _EXECUTOR_IMAGE_NAME: executor
-  _DOCKER_BUILDX_PLATFORMS: 'linux/amd64,linux/arm64'
diff --git a/deploy/cloudbuild-warmer-release.yaml b/deploy/cloudbuild-warmer-release.yaml
deleted file mode 100644
index f977f1b6f..000000000
--- a/deploy/cloudbuild-warmer-release.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-timeout: 1800s
-
-steps:
-# Set up builder for muti-arch builds.
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['run', '--privileged', 'linuxkit/binfmt:v0.7']
-  id: 'initialize-qemu'
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['buildx', 'create', '--use', '--platform', '${_DOCKER_BUILDX_PLATFORMS}']
-  id: 'create-builder'
-
-# Build the cache warmer
-- name: "gcr.io/cloud-builders/docker"
-  args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile_warmer",
-         "-t", "gcr.io/$PROJECT_ID/{_WARMER_IMAGE_NAME}:$TAG_NAME",
-         "-t", "gcr.io/$PROJECT_ID/{_WARMER_IMAGE_NAME}:latest", "--push", "."]
-
-options:
-  env:
-  - 'DOCKER_CLI_EXPERIMENTAL=enabled'
-
-substitutions:
-  _WARMER_IMAGE_NAME: warmer
-  _DOCKER_BUILDX_PLATFORMS: 'linux/amd64,linux/arm64'
\ No newline at end of file
diff --git a/deploy/cloudbuild-warmer.yaml b/deploy/cloudbuild-warmer.yaml
deleted file mode 100644
index f7ff6f990..000000000
--- a/deploy/cloudbuild-warmer.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-timeout: 1800s
-
-steps:
-  # Set up builder for muti-arch builds.
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['run', '--privileged', 'linuxkit/binfmt:v0.7']
-    id: 'initialize-qemu'
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['buildx', 'create', '--use', '--platform', '${_DOCKER_BUILDX_PLATFORMS}']
-    id: 'create-builder'
-
-  # Build the cache warmer
-  - name: "gcr.io/cloud-builders/docker"
-    args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile_warmer",
-           "-t", "gcr.io/$PROJECT_ID/${_WARMER_IMAGE_NAME}:$COMMIT_SHA", "--push", "."]
-
-options:
-  env:
-  - 'DOCKER_CLI_EXPERIMENTAL=enabled'
-
-substitutions:
-  _WARMER_IMAGE_NAME: warmer
-  _DOCKER_BUILDX_PLATFORMS: 'linux/amd64,linux/arm64'