diff --git a/.changeset/three-snakes-sing.md b/.changeset/three-snakes-sing.md
new file mode 100644
index 000000000..a845151cc
--- /dev/null
+++ b/.changeset/three-snakes-sing.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.github/workflows/odis-combiner-container.yml b/.github/workflows/odis-combiner-container.yml
index 831e23ec6..bf94e2798 100644
--- a/.github/workflows/odis-combiner-container.yml
+++ b/.github/workflows/odis-combiner-container.yml
@@ -8,6 +8,8 @@ on:
       - 'packages/phone-number-privacy/combiner/**'
     branches:
       - main
+    tags:
+      - odis-combiner-.*
   pull_request:
     paths:
       - 'dockerfiles/phone-number-privacy/Dockerfile-combiner'
@@ -42,3 +44,17 @@ jobs:
       context: .
       file: dockerfiles/phone-number-privacy/Dockerfile-combiner
       trivy: true
+
+  odis-combiner-tag:
+    uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.11.4
+    name: Build us-west1-docker.pkg.dev/devopsre/social-connect/odis-combiner
+    if: |
+      startsWith(github.ref, 'refs/tags/odis-combiner-')
+    with:
+      workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect-tag/providers/github-by-repos
+      service-account: 'social-connect@devopsre.iam.gserviceaccount.com'
+      artifact-registry: us-west1-docker.pkg.dev/devopsre/social-connect/odis-combiner
+      tag: ${{ github.ref_name }}
+      context: .
+      file: dockerfiles/phone-number-privacy/Dockerfile-combiner
+      trivy: true
diff --git a/.github/workflows/odis-loadtest-container.yml b/.github/workflows/odis-loadtest-container.yml
index ca58549ba..dc8b3bb3e 100644
--- a/.github/workflows/odis-loadtest-container.yml
+++ b/.github/workflows/odis-loadtest-container.yml
@@ -8,6 +8,8 @@
         - 'packages/phone-number-privacy/monitor/**'
       branches:
         - main
+      tags:
+        - odis-loadtest-.*
     pull_request:
       paths:
         - 'dockerfiles/phone-number-privacy/Dockerfile-loadtest'
@@ -42,3 +44,17 @@
         context: .
         file: dockerfiles/phone-number-privacy/Dockerfile-loadtest
         trivy: true
+
+    odis-loadtest-tag:
+      uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.0
+      name: Build us-west1-docker.pkg.dev/devopsre/social-connect/odis-loadtest
+      if: |
+        startsWith(github.ref, 'refs/tags/odis-loadtest-')
+      with:
+        workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect-tag/providers/github-by-repos
+        service-account: 'social-connect@devopsre.iam.gserviceaccount.com'
+        artifact-registry: us-west1-docker.pkg.dev/devopsre/social-connect/odis-loadtest
+        tag: ${{ github.ref_name }}
+        context: .
+        file: dockerfiles/phone-number-privacy/Dockerfile-loadtest
+        trivy: true
diff --git a/.github/workflows/odis-signer-container.yml b/.github/workflows/odis-signer-container.yml
index f3b8db0cc..7d15f016e 100644
--- a/.github/workflows/odis-signer-container.yml
+++ b/.github/workflows/odis-signer-container.yml
@@ -8,6 +8,8 @@
         - 'packages/phone-number-privacy/signer/**'
       branches:
         - main
+      tags:
+        - odis-signer-.*
     pull_request:
       paths:
         - 'dockerfiles/phone-number-privacy/Dockerfile-signer'
@@ -42,3 +44,17 @@
         context: .
         file: dockerfiles/phone-number-privacy/Dockerfile-signer
         trivy: true
+
+    odis-signer-tag:
+      uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v1.12.0
+      name: Build us-west1-docker.pkg.dev/devopsre/social-connect/odis-signer
+      if: |
+        startsWith(github.ref, 'refs/tags/odis-signer-')
+      with:
+        workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect-tag/providers/github-by-repos
+        service-account: 'social-connect@devopsre.iam.gserviceaccount.com'
+        artifact-registry: us-west1-docker.pkg.dev/devopsre/social-connect/odis-signer
+        tag: ${{ github.ref_name }}
+        context: .
+        file: dockerfiles/phone-number-privacy/Dockerfile-signer
+        trivy: true