diff --git a/.cloudbuild.yaml b/.cloudbuild.yaml
index 88d6d9b6319..e8ebf039af1 100644
--- a/.cloudbuild.yaml
+++ b/.cloudbuild.yaml
@@ -71,6 +71,10 @@ steps:
   args: ['build', '-t', 'gcr.io/$PROJECT_ID/persistenceagent:$COMMIT_SHA', '-f',
          '/workspace/backend/Dockerfile.persistenceagent', '/workspace']
   id:   'buildPersistenceAgent'
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/inverse-proxy-agent:$COMMIT_SHA', '-f',
+         '/workspace/proxy/Dockerfile', '/workspace']
+  id:   'buildInverseProxyAgent'
 
 # Build the Dataflow-based pipeline component images
 - name: 'gcr.io/cloud-builders/docker'
@@ -177,6 +181,7 @@ images:
 - 'gcr.io/$PROJECT_ID/scheduledworkflow:$COMMIT_SHA'
 - 'gcr.io/$PROJECT_ID/persistenceagent:$COMMIT_SHA'
 - 'gcr.io/$PROJECT_ID/viewer-crd-controller:$COMMIT_SHA'
+- 'gcr.io/$PROJECT_ID/inverse-proxy-agent:$COMMIT_SHA'
 
 # Images for the Dataflow-based pipeline components
 - 'gcr.io/$PROJECT_ID/ml-pipeline-dataflow-tf-predict:$COMMIT_SHA'
diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml
index 38598e1bb8a..0cd7bb0e3d7 100644
--- a/.release.cloudbuild.yaml
+++ b/.release.cloudbuild.yaml
@@ -74,6 +74,18 @@ steps:
   id:   'tagPersistenceagentCommitSHA'
   waitFor: ['pullPersistenceagent']
 
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['pull', 'gcr.io/$PROJECT_ID/inverse-proxy-agent:$COMMIT_SHA']
+  id:   'pullInverseProxyAgent'
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['tag', 'gcr.io/$PROJECT_ID/inverse-proxy-agent:$COMMIT_SHA', 'gcr.io/ml-pipeline/inverse-proxy-agent:$TAG_NAME']
+  id:   'tagInverseProxyAgentVersionNumber'
+  waitFor: ['pullInverseProxyAgent']
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['tag', 'gcr.io/$PROJECT_ID/inverse-proxy-agent:$COMMIT_SHA', 'gcr.io/ml-pipeline/inverse-proxy-agent:$COMMIT_SHA']
+  id:   'tagInverseProxyAgentCommitSHA'
+  waitFor: ['pullInverseProxyAgent']
+
 # Copy the Python SDK
 - name: 'gcr.io/cloud-builders/gsutil'
   args: ['cp', 'gs://$PROJECT_ID/builds/$COMMIT_SHA/kfp.tar.gz', '/workspace/']
@@ -126,5 +138,7 @@ images:
 - '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'
+- 'gcr.io/ml-pipeline/inverse-proxy-agent:$TAG_NAME'
+- 'gcr.io/ml-pipeline/inverse-proxy-agent:$COMMIT_SHA'
 
 timeout: '1200s'