diff --git a/docker/cli-tools/cloudbuild.yaml b/docker/cli-tools/cloudbuild.yaml
index e9537d742f..14c0baae42 100644
--- a/docker/cli-tools/cloudbuild.yaml
+++ b/docker/cli-tools/cloudbuild.yaml
@@ -3,24 +3,18 @@ timeout: 1200s
 steps:
 - name: 'gcr.io/cloud-builders/docker'
   id: toolbox
-  args: ['build', '-t', 'gcr.io/forgeops-public/toolbox', 'toolbox']
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/toolbox', 'toolbox']
+  dir: docker/cli-tools
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/repo', 'repo']
   dir: docker/cli-tools
-- name: 'gcr.io/cloud-builders/docker'                            
-  args: ['build', '-t', 'gcr.io/engineering-devops/repo', 'repo'] 
-  dir: docker/cli-tools                                           
   waitFor:
     - toolbox
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['build', '-t', 'gcr.io/forgeops-public/git-server', 'git-server']
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/git-server', 'git-server']
   dir: docker/cli-tools
   waitFor: ['-']
-- name: 'gcr.io/cloud-builders/docker'                            
-  args: ['build', '-t', 'gcr.io/forgeops-public/patcher:7.1-dev', 'patcher'] 
-  dir: docker/cli-tools                                           
-  waitFor: ['-']
-
 images:
-- gcr.io/forgeops-public/toolbox
-- gcr.io/engineering-devops/repo
-- gcr.io/forgeops-public/git-server
-- gcr.io/forgeops-public/patcher:7.1-dev
+- gcr.io/$PROJECT_ID/toolbox
+- gcr.io/$PROJECT_ID/repo
+- gcr.io/$PROJECT_ID/git-server
diff --git a/release.yaml b/release.yaml
index 5e3ed098d8..297144539d 100644
--- a/release.yaml
+++ b/release.yaml
@@ -7,6 +7,7 @@ steps:
 - name: 'gcr.io/cloud-builders/docker'
   entrypoint: 'bash'
   env:
+    - REPO=$_REPO
     - IMAGE_TAG=$TAG_NAME
   args:
     - '-c'
@@ -17,12 +18,14 @@ steps:
   entrypoint: bash
   env:
     - IMAGE_TAG=$TAG_NAME
+    - PROFILE_NAME=$_PROFILE_NAME
+    - REPO=$_REPO
   args:
     - '-c'
     - |-
-      ./bin/build-cdk-image-tags
+      ./cicd/bin/build-image-tags
 
-- name: 'gcr.io/engineering-devops/repo'
+- name: 'gcr.io/$PROJECT_ID/repo'
   entrypoint: bash
   secretEnv:
     - 'GH_TOKEN'
@@ -32,9 +35,11 @@ steps:
   args:
     - '-c'
     - |-
-      make -f docker/cli-tools/repo/Makefile release
+      [[ $_CREATE_RELEASE == 1 ]] \
+      && make -f docker/cli-tools/repo/Makefile release \
+      || echo "Not creating release."
 
 availableSecrets:
   secretManager:
-    - versionName: projects/1067706085367/secrets/GH_API_CLOUDBUILD/versions/2
+    - versionName: projects/1067706085367/secrets/GH_API_CLOUDBUILD/versions/latest
       env: 'GH_TOKEN'