diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/metadata.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/metadata.yaml
index 6a4497c8f98..af0547b92cc 100644
--- a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/metadata.yaml
+++ b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/metadata.yaml
@@ -58,17 +58,17 @@ spec:
         - name: MYSQL_DATABASE
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
+              name: metadata-mysql-configmap
               key: mysql_database
         - name: MYSQL_HOST
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
+              name: metadata-mysql-configmap
               key: mysql_host
         - name: MYSQL_PORT
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
+              name: metadata-mysql-configmap
               key: mysql_port
         command: ["/bin/metadata_store_server"]
         args: ["--grpc_port=8080",
@@ -140,3 +140,30 @@ data:
   mysql_port: "3306"
   username: "root"
   password: ""
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: metadata-mysql-configmap
+  labels:
+    component: metadata-server
+data:
+  {{ if .Values.managedstorage.databaseNamePrefix }}
+  mysql_database: '{{ .Values.managedstorage.databaseNamePrefix }}_metadata'
+  {{ else }}
+  mysql_database: '{{ .Release.Name | replace "-" "_" | replace "." "_"}}_metadata'
+  {{ end }}
+  mysql_host: "mysql"
+  mysql_port: "3306"
+  username: "root"
+  password: ""
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: metadata-grpc-configmap
+  labels:
+    component: metadata-server
+data:
+  METADATA_GRPC_SERVICE_HOST: "metadata-service"
+  METADATA_GRPC_SERVICE_PORT: "8080"
diff --git a/manifests/kustomize/base/metadata/metadata-configmap.yaml b/manifests/kustomize/base/metadata/metadata-configmap.yaml
index 27841b4e591..6fd453e5e80 100644
--- a/manifests/kustomize/base/metadata/metadata-configmap.yaml
+++ b/manifests/kustomize/base/metadata/metadata-configmap.yaml
@@ -1,3 +1,4 @@
+# metadata-config is retained for backward compatibility reasons.
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -8,3 +9,24 @@ data:
   mysql_database: "metadb"
   mysql_host: "mysql"
   mysql_port: "3306"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: metadata-mysql-configmap
+  labels:
+    component: metadata-server
+data:
+  mysql_database: "metadb"
+  mysql_host: "mysql"
+  mysql_port: "3306"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: metadata-grpc-configmap
+  labels:
+    component: metadata-server
+data:
+  METADATA_GRPC_SERVICE_HOST: "metadata-service"
+  METADATA_GRPC_SERVICE_PORT: "8080"
diff --git a/manifests/kustomize/base/metadata/metadata-deployment.yaml b/manifests/kustomize/base/metadata/metadata-deployment.yaml
index 4d52188b1c4..f463f74c0d9 100644
--- a/manifests/kustomize/base/metadata/metadata-deployment.yaml
+++ b/manifests/kustomize/base/metadata/metadata-deployment.yaml
@@ -31,17 +31,17 @@ spec:
         - name: MYSQL_DATABASE
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
+              name: metadata-mysql-configmap
               key: mysql_database
         - name: MYSQL_HOST
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
+              name: metadata-mysql-configmap
               key: mysql_host
         - name: MYSQL_PORT
           valueFrom:
             configMapKeyRef:
-              name: metadata-configmap
+              name: metadata-mysql-configmap
               key: mysql_port
         command: ["/bin/metadata_store_server"]
         args: ["--grpc_port=8080",