diff --git a/cloudbuild_master.yaml b/cloudbuild_master.yaml
index 73db4ac90e..40aa09a457 100644
--- a/cloudbuild_master.yaml
+++ b/cloudbuild_master.yaml
@@ -8,26 +8,6 @@ substitutions:
 options:
   machineType: E2_HIGHCPU_32
 steps:
-- id: pull_mysql
-  name : gcr.io/cloud-builders/docker
-  args:
-  - pull
-  - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
-- id: tag_mysql
-  name: gcr.io/cloud-builders/docker
-  args:
-  - tag
-  - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
-  - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
-  waitFor:
-  - pull_mysql
-- id: push_mysql
-  name: gcr.io/cloud-builders/docker
-  args:
-  - push
-  - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
-  waitFor:
-  - tag_mysql
 - id: build_db_server
   name: gcr.io/kaniko-project/executor:v1.15.0
   args:
@@ -36,8 +16,6 @@ steps:
   - --destination=gcr.io/${PROJECT_ID}/db_server:latest
   - --cache=true
   - --cache-dir= # Cache is in Google Container Registry
-  waitFor:
-  - push_mysql
 - id: build_log_server
   name: gcr.io/kaniko-project/executor:v1.15.0
   args:
diff --git a/cloudbuild_pr.yaml b/cloudbuild_pr.yaml
index 05349ad19d..f682a25944 100644
--- a/cloudbuild_pr.yaml
+++ b/cloudbuild_pr.yaml
@@ -13,27 +13,6 @@ options:
 
 steps:
 
-- id: pull_mysql
-  name : gcr.io/cloud-builders/docker
-  args:
-  - pull
-  - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
-- id: tag_mysql
-  name: gcr.io/cloud-builders/docker
-  args:
-  - tag
-  - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
-  - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
-  waitFor:
-  - pull_mysql
-- id: push_mysql
-  name: gcr.io/cloud-builders/docker
-  args:
-  - push
-  - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
-  waitFor:
-  - tag_mysql
-
 - id: build_db_server
   name: gcr.io/kaniko-project/executor:v1.15.0
   args:
@@ -41,8 +20,6 @@ steps:
   - --destination=gcr.io/${PROJECT_ID}/db_server:${COMMIT_SHA}
   - --cache=true
   - --cache-dir= # Cache is in Google Container Registry.
-  waitFor:
-  - push_mysql
 
 - id: build_log_server
   name: gcr.io/kaniko-project/executor:v1.15.0
diff --git a/cloudbuild_tag.yaml b/cloudbuild_tag.yaml
index 35d9e5920b..302f2e9229 100644
--- a/cloudbuild_tag.yaml
+++ b/cloudbuild_tag.yaml
@@ -4,26 +4,6 @@ substitutions:
 options:
   machineType: E2_HIGHCPU_32
 steps:
-- id: pull_mysql
-  name : gcr.io/cloud-builders/docker
-  args:
-  - pull
-  - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
-- id: tag_mysql
-  name: gcr.io/cloud-builders/docker
-  args:
-  - tag
-  - marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
-  - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
-  waitFor:
-  - pull_mysql
-- id: push_mysql
-  name: gcr.io/cloud-builders/docker
-  args:
-  - push
-  - gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
-  waitFor:
-  - tag_mysql
 - id: build_db_server
   name: gcr.io/kaniko-project/executor:v1.15.0
   args:
@@ -31,8 +11,6 @@ steps:
   - --destination=gcr.io/${PROJECT_ID}/db_server:${TAG_NAME}
   - --cache=true
   - --cache-dir= # Cache is in Google Container Registry
-  waitFor:
-  - push_mysql
 - id: build_log_server
   name: gcr.io/kaniko-project/executor:v1.15.0
   args: