diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml
index ccdbb2fb935..3eef8ed14e1 100644
--- a/.release.cloudbuild.yaml
+++ b/.release.cloudbuild.yaml
@@ -243,14 +243,14 @@ steps:
     docker push gcr.io/ml-pipeline/google/pipelines-test/visualizationserver:$(cat /workspace/mm.ver)
 
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['pull', 'gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.1']
+  args: ['pull', 'gcr.io/tfx-oss-public/ml_metadata_store_server:0.21.1']
   id:   'pullMetadataServer'
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.1', 'gcr.io/ml-pipeline/google/pipelines/metadataserver:$TAG_NAME']
+  args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:0.21.1', 'gcr.io/ml-pipeline/google/pipelines/metadataserver:$TAG_NAME']
   id:   'tagMetadataServerForMarketplace'
   waitFor: ['pullMetadataServer']
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.1', 'gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$TAG_NAME']
+  args: ['tag', 'gcr.io/tfx-oss-public/ml_metadata_store_server:0.21.1', 'gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$TAG_NAME']
   id:   'tagMetadataServerForMarketplaceTest'
   waitFor: ['pullMetadataServer']
 - id:   'tagMetadataServerForMarketplaceMajorMinor'
@@ -260,8 +260,8 @@ steps:
   args:
   - -ceux
   - |
-    docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.1 gcr.io/ml-pipeline/google/pipelines/metadataserver:$(cat /workspace/mm.ver)
-    docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.1 gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$(cat /workspace/mm.ver)
+    docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:0.21.1 gcr.io/ml-pipeline/google/pipelines/metadataserver:$(cat /workspace/mm.ver)
+    docker tag gcr.io/tfx-oss-public/ml_metadata_store_server:0.21.1 gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$(cat /workspace/mm.ver)
     docker push gcr.io/ml-pipeline/google/pipelines/metadataserver:$(cat /workspace/mm.ver)
     docker push gcr.io/ml-pipeline/google/pipelines-test/metadataserver:$(cat /workspace/mm.ver)
 
diff --git a/manifests/kustomize/base/metadata/metadata-deployment.yaml b/manifests/kustomize/base/metadata/metadata-deployment.yaml
index 7d8547c0753..938eb1b8a96 100644
--- a/manifests/kustomize/base/metadata/metadata-deployment.yaml
+++ b/manifests/kustomize/base/metadata/metadata-deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: container
-        image: gcr.io/tfx-oss-public/ml_metadata_store_server:v0.21.1
+        image: gcr.io/tfx-oss-public/ml_metadata_store_server:0.21.1
         env:
         - name: DBCONFIG_USER
           valueFrom:
diff --git a/test/deploy-pipeline-mkp-cli.sh b/test/deploy-pipeline-mkp-cli.sh
index ad717835594..4b85f969b03 100644
--- a/test/deploy-pipeline-mkp-cli.sh
+++ b/test/deploy-pipeline-mkp-cli.sh
@@ -73,7 +73,7 @@ echo MKP_VERSION:$MKP_VERSION, GCR_FOLDER:$GCR_FOLDER
 
 export ARGO_VERSION=v2.3.0-license-compliance
 export CLOUDSQL_PROXY_VERSION=1.14
-export MLMD_SERVER_VERSION=v0.21.1
+export MLMD_SERVER_VERSION=0.21.1
 export MLMD_ENVOY_VERSION=initial
 export MINIO_VERSION=RELEASE.2019-08-14T20-37-41Z-license-compliance
 export MYSQL_VERSION=5.6