diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml
index 00eb3071df9..8513fb6e464 100644
--- a/.release.cloudbuild.yaml
+++ b/.release.cloudbuild.yaml
@@ -50,6 +50,18 @@ steps:
   id:   'tagScheduledworkflowCommitSHA'
   waitFor: ['pullScheduledworkflow']
 
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['pull', 'gcr.io/$PROJECT_ID/viewer-crd-controller:$COMMIT_SHA']
+  id:   'pullViewerCrdController'
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['tag', 'gcr.io/$PROJECT_ID/viewer-crd-controller:$COMMIT_SHA', 'gcr.io/ml-pipeline/viewer-crd-controller:$TAG_NAME']
+  id:   'tagViewerCrdControllerVersionNumber'
+  waitFor: ['pullViewerCrdController']
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['tag', 'gcr.io/$PROJECT_ID/viewer-crd-controller:$COMMIT_SHA', 'gcr.io/ml-pipeline/viewer-crd-controller:$COMMIT_SHA']
+  id:   'tagViewerCrdControllerCommitSHA'
+  waitFor: ['pullViewerCrdController']
+
 - name: 'gcr.io/cloud-builders/docker'
   args: ['pull', 'gcr.io/$PROJECT_ID/persistenceagent:$COMMIT_SHA']
   id:   'pullPersistenceagent'
@@ -99,5 +111,7 @@ images:
 - 'gcr.io/ml-pipeline/scheduledworkflow:$COMMIT_SHA'
 - 'gcr.io/ml-pipeline/persistenceagent:$TAG_NAME'
 - 'gcr.io/ml-pipeline/persistenceagent:$COMMIT_SHA'
+- 'gcr.io/ml-pipeline/viewer-crd-controller:$TAG_NAME'
+- 'gcr.io/ml-pipeline/viewer-crd-controller:$COMMIT_SHA'
 
 timeout: '1200s'