diff --git a/api/cloudbuild.yaml b/api/cloudbuild.yaml
index 05ad8cd0ad..32dc9b1be7 100644
--- a/api/cloudbuild.yaml
+++ b/api/cloudbuild.yaml
@@ -82,7 +82,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/api-js:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/api-js:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/azure-defender-easm/add-domain-to-easm/cloudbuild.yaml b/azure-defender-easm/add-domain-to-easm/cloudbuild.yaml
index 685594c43b..adbfe419c8 100644
--- a/azure-defender-easm/add-domain-to-easm/cloudbuild.yaml
+++ b/azure-defender-easm/add-domain-to-easm/cloudbuild.yaml
@@ -6,7 +6,7 @@ steps:
     args:
       - "-c"
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/azure-defender-easm/add-domain-to-easm:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/azure-defender-easm/add-domain-to-easm:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: "gcr.io/cloud-builders/docker"
     id: build-https-if-master
diff --git a/azure-defender-easm/label-known-easm-assets/cloudbuild.yaml b/azure-defender-easm/label-known-easm-assets/cloudbuild.yaml
index 9dfd06756c..730bb47ae9 100644
--- a/azure-defender-easm/label-known-easm-assets/cloudbuild.yaml
+++ b/azure-defender-easm/label-known-easm-assets/cloudbuild.yaml
@@ -6,7 +6,7 @@ steps:
     args:
       - "-c"
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/azure-defender-easm/label-known-easm-assets:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/azure-defender-easm/label-known-easm-assets:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: "gcr.io/cloud-builders/docker"
     id: build-https-if-master
diff --git a/ci/README.md b/ci/README.md
index 349d814244..2ac2a0ea16 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -6,11 +6,11 @@ You can see it in the cloudbuild.yaml files under the name "track-compliance/ci"
 To build a copy of this image:
 
 ```sh
-docker build -t northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci .
+docker build -t gcr.io/track-compliance/ci .
 ```
 To push to the registry you will need to configure docker with proper credentials.
 
 ```sh
 gcloud auth configure-docker
-docker push northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci
+docker push gcr.io/track-compliance/ci
 ```
diff --git a/ci/cloudbuild.yaml b/ci/cloudbuild.yaml
index 29f42bfe7e..e07da8bb77 100644
--- a/ci/cloudbuild.yaml
+++ b/ci/cloudbuild.yaml
@@ -9,7 +9,7 @@ steps:
     - |
       if [[ "$BRANCH_NAME" == "master" ]]
       then
-        docker build -t northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci .
+        docker build -t gcr.io/track-compliance/ci .
       else
         exit 0
       fi
@@ -23,7 +23,7 @@ steps:
     - |
       if [[ "$BRANCH_NAME" == "master" ]]
       then
-        docker push northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci
+        docker push gcr.io/track-compliance/ci
       else
         exit 0
       fi
diff --git a/clients/python/cloudbuild.yaml b/clients/python/cloudbuild.yaml
index 34ab0b38c5..e8e7b5b6e6 100644
--- a/clients/python/cloudbuild.yaml
+++ b/clients/python/cloudbuild.yaml
@@ -1,5 +1,5 @@
 steps:
-  - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci'
+  - name: 'gcr.io/track-compliance/ci'
     id: install-client-deps
     dir: clients/python
     entrypoint: pipenv
@@ -7,13 +7,13 @@ steps:
     env:
       - PIPENV_NOSPIN=TRUE
 
-  - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci'
+  - name: 'gcr.io/track-compliance/ci'
     id: lint-client
     dir: clients/python
     entrypoint: /bin/sh
     args: ['-c', 'pipenv run black --check tracker_client/ && pipenv run bandit -r tracker_client/']
 
-  - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci'
+  - name: 'gcr.io/track-compliance/ci'
     id: test-client
     dir: clients/python
     entrypoint: pipenv
@@ -26,4 +26,4 @@ steps:
 timeout: 1200s
 options:
   machineType: 'E2_HIGHCPU_8'
-
+  
diff --git a/frontend-maintenance/cloudbuild.yaml b/frontend-maintenance/cloudbuild.yaml
index 48818707e8..2455556ace 100644
--- a/frontend-maintenance/cloudbuild.yaml
+++ b/frontend-maintenance/cloudbuild.yaml
@@ -6,7 +6,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/frontend-maintenance:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/frontend-maintenance:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/frontend/cloudbuild.yaml b/frontend/cloudbuild.yaml
index db0824dbdf..7fb1ab45ec 100644
--- a/frontend/cloudbuild.yaml
+++ b/frontend/cloudbuild.yaml
@@ -42,7 +42,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/frontend:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/frontend:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/k8s/apps/bases/azure-defender-easm/add-domain-to-easm/deployment.yaml b/k8s/apps/bases/azure-defender-easm/add-domain-to-easm/deployment.yaml
index f0d2ae9a02..9747a9a8ef 100644
--- a/k8s/apps/bases/azure-defender-easm/add-domain-to-easm/deployment.yaml
+++ b/k8s/apps/bases/azure-defender-easm/add-domain-to-easm/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: add-domain-to-easm
-          image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/azure-defender-easm/add-domain-to-easm:master-5104232-1706728878 # {"$imagepolicy": "flux-system:add-domain-to-easm"}
+          image: gcr.io/track-compliance/azure-defender-easm/add-domain-to-easm:master-5104232-1706728878 # {"$imagepolicy": "flux-system:add-domain-to-easm"}
           env:
             - name: SUBSCRIBE_TO
               value: domains.*
diff --git a/k8s/apps/bases/azure-defender-easm/label-known-easm-assets-cronjob/cronjob.yaml b/k8s/apps/bases/azure-defender-easm/label-known-easm-assets-cronjob/cronjob.yaml
index 47b9e92b2a..4e7f388471 100644
--- a/k8s/apps/bases/azure-defender-easm/label-known-easm-assets-cronjob/cronjob.yaml
+++ b/k8s/apps/bases/azure-defender-easm/label-known-easm-assets-cronjob/cronjob.yaml
@@ -16,7 +16,7 @@ spec:
         spec:
           containers:
             - name: label-known-easm-assets
-              image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/azure-defender-easm/label-known-easm-assets:master-8296e62-1706728448 # {"$imagepolicy": "flux-system:label-known-easm-assets"}
+              image: gcr.io/track-compliance/azure-defender-easm/label-known-easm-assets:master-8296e62-1706728448 # {"$imagepolicy": "flux-system:label-known-easm-assets"}
               env:
                 - name: DB_PASS
                   valueFrom:
diff --git a/k8s/apps/bases/frontend/maintenance-deployment.yaml b/k8s/apps/bases/frontend/maintenance-deployment.yaml
index 41deaa6a50..1b6866ac94 100644
--- a/k8s/apps/bases/frontend/maintenance-deployment.yaml
+++ b/k8s/apps/bases/frontend/maintenance-deployment.yaml
@@ -20,7 +20,7 @@ spec:
         app: tracker-frontend-maintenance
     spec:
       containers:
-        - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend-maintenance:master-a1a1a1b-1692191661 # {"$imagepolicy": "flux-system:frontend-maintenance"}
+        - image: gcr.io/track-compliance/frontend-maintenance:master-a1a1a1b-1692191661 # {"$imagepolicy": "flux-system:frontend-maintenance"}
           name: frontend-maintenance
           resources:
             limits:
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/add-domain-to-easm-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/add-domain-to-easm-image-repo-policy.yaml
index fb582bd9cc..1f02efab31 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/add-domain-to-easm-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/add-domain-to-easm-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: add-domain-to-easm
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/add-domain-to-easm
+  image: gcr.io/track-compliance/add-domain-to-easm
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/api-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/api-image-repo-policy.yaml
index a33699eba1..6e01bf998d 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/api-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/api-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: api
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/api-js
+  image: gcr.io/track-compliance/api-js
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/dmarc-report-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/dmarc-report-image-repo-policy.yaml
index 431eeb348e..edf58dc5e7 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/dmarc-report-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/dmarc-report-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: dmarc-report
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dmarc-report
+  image: gcr.io/track-compliance/dmarc-report
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-processor-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-processor-image-repo-policy.yaml
index 6e86af56b2..29544322cc 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-processor-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-processor-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: dns-processor
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-processor
+  image: gcr.io/track-compliance/dns-processor
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-scanner-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-scanner-image-repo-policy.yaml
index 311bd407be..33a42a18b1 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-scanner-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-scanner-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: dns-scanner
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-scanner
+  image: gcr.io/track-compliance/dns-scanner
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-cleanup-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-cleanup-image-repo-policy.yaml
index 43ce905cee..394077bd38 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-cleanup-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-cleanup-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: domain-cleanup
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/domain-cleanup
+  image: gcr.io/track-compliance/services/domain-cleanup
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-discovery-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-discovery-image-repo-policy.yaml
index e5340ef757..5d6a3937c5 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-discovery-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-discovery-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: domain-discovery
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-discovery
+  image: gcr.io/track-compliance/domain-discovery
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-dispatcher-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-dispatcher-image-repo-policy.yaml
index 7725dc97e7..42b75b2616 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-dispatcher-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-dispatcher-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: domain-dispatcher
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-dispatcher
+  image: gcr.io/track-compliance/domain-dispatcher
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-image-repo-policy.yaml
index 39be1017ed..609ef7c079 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: frontend
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend
+  image: gcr.io/track-compliance/frontend
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-maintenance-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-maintenance-image-repo-policy.yaml
index 645d4757ae..c8b9eb72a6 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-maintenance-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-maintenance-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: frontend-maintenance
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend-maintenance
+  image: gcr.io/track-compliance/frontend-maintenance
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/guidance-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/guidance-image-repo-policy.yaml
index d57589f256..75ef408d05 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/guidance-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/guidance-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: guidance
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/guidance
+  image: gcr.io/track-compliance/services/guidance
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/label-known-easm-assets-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/label-known-easm-assets-image-repo-policy.yaml
index e7ba594cf2..b30edf09e8 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/label-known-easm-assets-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/label-known-easm-assets-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: label-known-easm-assets
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/label-known-easm-assets
+  image: gcr.io/track-compliance/label-known-easm-assets
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-processor-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-processor-image-repo-policy.yaml
index 982bdd6757..c52f06d1bd 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-processor-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-processor-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: log4shell-processor
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-processor
+  image: gcr.io/track-compliance/log4shell-processor
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-scanner-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-scanner-image-repo-policy.yaml
index 05c21261b4..7d28a9a97b 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-scanner-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-scanner-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: log4shell-scanner
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-scanner
+  image: gcr.io/track-compliance/log4shell-scanner
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/org-footprint-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/org-footprint-image-repo-policy.yaml
index 2ba2d830ca..72e33e4e6a 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/org-footprint-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/org-footprint-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: org-footprint
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/org-footprint
+  image: gcr.io/track-compliance/services/org-footprint
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/progress-report-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/progress-report-image-repo-policy.yaml
index f1a8dbf35c..732eac0d8b 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/progress-report-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/progress-report-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: progress-report
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/progress-report
+  image: gcr.io/track-compliance/services/progress-report
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/spring4shell-scanner-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/spring4shell-scanner-image-repo-policy.yaml
index a6f407522f..4dd0b644cd 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/spring4shell-scanner-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/spring4shell-scanner-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: spring4shell-scanner
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/spring4shell-scanner
+  image: gcr.io/track-compliance/spring4shell-scanner
   interval: 1m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/summaries-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/summaries-image-repo-policy.yaml
index a10ea09c7f..944b1c066c 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/summaries-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/summaries-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: summaries
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/summaries
+  image: gcr.io/track-compliance/services/summaries
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/super-admin-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/super-admin-image-repo-policy.yaml
index 013e13d560..d0ab1f0b9f 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/super-admin-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/super-admin-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: super-admin
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/super-admin
+  image: gcr.io/track-compliance/super-admin
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/update-selectors-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/update-selectors-image-repo-policy.yaml
index d82e1790e1..32571ba302 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/update-selectors-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/update-selectors-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: update-selectors
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/update-selectors
+  image: gcr.io/track-compliance/services/update-selectors
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/web-processor-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/web-processor-image-repo-policy.yaml
index 4eced0a98b..dd6efb0ddf 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/web-processor-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/web-processor-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: web-processor
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-processor
+  image: gcr.io/track-compliance/web-processor
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/web-scanner-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/web-scanner-image-repo-policy.yaml
index 2e9a9aca30..bf4883e024 100644
--- a/k8s/clusters/auto-image-update/bases/image-repo-policies/web-scanner-image-repo-policy.yaml
+++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/web-scanner-image-repo-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: web-scanner
   namespace: flux-system
 spec:
-  image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-scanner
+  image: gcr.io/track-compliance/web-scanner
   interval: 5m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1alpha1
diff --git a/scanners/dns-processor/cloudbuild.yaml b/scanners/dns-processor/cloudbuild.yaml
index a4440de09c..4b9c2b91d2 100644
--- a/scanners/dns-processor/cloudbuild.yaml
+++ b/scanners/dns-processor/cloudbuild.yaml
@@ -7,7 +7,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/dns-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/dns-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-https-if-master
diff --git a/scanners/dns-scanner/cloudbuild.yaml b/scanners/dns-scanner/cloudbuild.yaml
index fc856da1b6..3e17a3c111 100644
--- a/scanners/dns-scanner/cloudbuild.yaml
+++ b/scanners/dns-scanner/cloudbuild.yaml
@@ -7,7 +7,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/dns-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/dns-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-dns-if-master
diff --git a/scanners/domain-discovery/cloudbuild.yaml b/scanners/domain-discovery/cloudbuild.yaml
index 9febc3b2c1..dfc57b429e 100644
--- a/scanners/domain-discovery/cloudbuild.yaml
+++ b/scanners/domain-discovery/cloudbuild.yaml
@@ -6,7 +6,7 @@ steps:
     args:
       - "-c"
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/domain-discovery:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/domain-discovery:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: "gcr.io/cloud-builders/docker"
     id: build-discover-if-master
diff --git a/scanners/domain-dispatcher/cloudbuild.yaml b/scanners/domain-dispatcher/cloudbuild.yaml
index 90985e6d83..a0410c0d10 100644
--- a/scanners/domain-dispatcher/cloudbuild.yaml
+++ b/scanners/domain-dispatcher/cloudbuild.yaml
@@ -47,7 +47,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/domain-dispatcher:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/domain-dispatcher:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/scanners/log4shell-processor/cloudbuild.yaml b/scanners/log4shell-processor/cloudbuild.yaml
index 43f72d60b3..1be2e4137b 100644
--- a/scanners/log4shell-processor/cloudbuild.yaml
+++ b/scanners/log4shell-processor/cloudbuild.yaml
@@ -6,7 +6,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/log4shell-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/log4shell-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/scanners/log4shell-scanner/cloudbuild.yaml b/scanners/log4shell-scanner/cloudbuild.yaml
index 3d4c89c833..064a726f4c 100644
--- a/scanners/log4shell-scanner/cloudbuild.yaml
+++ b/scanners/log4shell-scanner/cloudbuild.yaml
@@ -6,7 +6,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/log4shell-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/log4shell-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/scanners/spring4shell/cloudbuild.yaml b/scanners/spring4shell/cloudbuild.yaml
index 31f03c877a..3a49370578 100644
--- a/scanners/spring4shell/cloudbuild.yaml
+++ b/scanners/spring4shell/cloudbuild.yaml
@@ -7,7 +7,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/spring4shell-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/spring4shell-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/scanners/web-processor/cloudbuild.yaml b/scanners/web-processor/cloudbuild.yaml
index 02fe96fad2..3ec06ce2a3 100644
--- a/scanners/web-processor/cloudbuild.yaml
+++ b/scanners/web-processor/cloudbuild.yaml
@@ -7,7 +7,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/web-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/web-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-https-if-master
diff --git a/scanners/web-scanner/cloudbuild.yaml b/scanners/web-scanner/cloudbuild.yaml
index d5f101b2f8..940d23ff8f 100644
--- a/scanners/web-scanner/cloudbuild.yaml
+++ b/scanners/web-scanner/cloudbuild.yaml
@@ -7,7 +7,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/web-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/web-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-web-if-master
diff --git a/services/dmarc-report/cloudbuild.yaml b/services/dmarc-report/cloudbuild.yaml
index 6672318a61..dcbf6e146b 100644
--- a/services/dmarc-report/cloudbuild.yaml
+++ b/services/dmarc-report/cloudbuild.yaml
@@ -50,7 +50,7 @@ steps:
   args:
     - '-c'
     - |
-      echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/dmarc-report:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+      echo "gcr.io/$PROJECT_ID/dmarc-report:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
 - name: 'gcr.io/cloud-builders/docker'
   id: build-if-master
diff --git a/services/domain-cleanup/cloudbuild.yaml b/services/domain-cleanup/cloudbuild.yaml
index 59a5b2dedd..4fadb5e666 100644
--- a/services/domain-cleanup/cloudbuild.yaml
+++ b/services/domain-cleanup/cloudbuild.yaml
@@ -41,7 +41,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/domain-cleanup:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/services/domain-cleanup:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/services/guidance/cloudbuild.yaml b/services/guidance/cloudbuild.yaml
index ce2b92775e..f5a5257f4e 100644
--- a/services/guidance/cloudbuild.yaml
+++ b/services/guidance/cloudbuild.yaml
@@ -6,7 +6,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/guidance:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/services/guidance:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-results-if-master
diff --git a/services/org-footprint/cloudbuild.yaml b/services/org-footprint/cloudbuild.yaml
index 37ffa39b7b..02b2b0a919 100644
--- a/services/org-footprint/cloudbuild.yaml
+++ b/services/org-footprint/cloudbuild.yaml
@@ -46,7 +46,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/org-footprint:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/services/org-footprint:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/services/progress-report/cloudbuild.yaml b/services/progress-report/cloudbuild.yaml
index 339a54a429..0e3225a79f 100644
--- a/services/progress-report/cloudbuild.yaml
+++ b/services/progress-report/cloudbuild.yaml
@@ -46,7 +46,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/progress-report:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/services/progress-report:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-if-master
diff --git a/services/summaries/cloudbuild.yaml b/services/summaries/cloudbuild.yaml
index 878454c0c4..e28d878524 100644
--- a/services/summaries/cloudbuild.yaml
+++ b/services/summaries/cloudbuild.yaml
@@ -8,7 +8,7 @@ steps:
     id: wait_testdb
     args: ['testdb:8529']
 
-  - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci'
+  - name: 'gcr.io/track-compliance/ci'
     id: test-results
     dir: services/summaries
     entrypoint: /bin/sh
@@ -21,7 +21,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/summaries:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/services/summaries:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-results-if-master
diff --git a/services/super-admin/cloudbuild.yaml b/services/super-admin/cloudbuild.yaml
index e7babdd691..35a65b28d3 100644
--- a/services/super-admin/cloudbuild.yaml
+++ b/services/super-admin/cloudbuild.yaml
@@ -61,7 +61,7 @@ steps:
   args:
     - '-c'
     - |
-      echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/super-admin:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+      echo "gcr.io/$PROJECT_ID/super-admin:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
 - name: 'gcr.io/cloud-builders/docker'
   id: build-if-master
diff --git a/services/update-selectors/cloudbuild.yaml b/services/update-selectors/cloudbuild.yaml
index d2943864a8..2e59ef9cd8 100644
--- a/services/update-selectors/cloudbuild.yaml
+++ b/services/update-selectors/cloudbuild.yaml
@@ -17,7 +17,7 @@ steps:
     id: wait_test_cosmosdb
     args: ['cosmosdb:8081', '--timeout=180']
 
-  - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci'
+  - name: 'gcr.io/track-compliance/ci'
     id: test-results
     dir: services/update-selectors
     entrypoint: /bin/sh
@@ -35,7 +35,7 @@ steps:
     args:
       - '-c'
       - |
-        echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/update-selectors:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
+        echo "gcr.io/$PROJECT_ID/services/update-selectors:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename
 
   - name: 'gcr.io/cloud-builders/docker'
     id: build-results-if-master
diff --git a/skaffold.yaml b/skaffold.yaml
index 219d2d8f60..07ee565873 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -6,58 +6,58 @@ requires:
   - configs: ["infrastructure"]
 build:
   artifacts:
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/api-js
+  - image: gcr.io/track-compliance/api-js
     context: api
     docker: {}
-#  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/counter
+#  - image: gcr.io/track-compliance/counter
 #    context: scanners/counter
 #    docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/database-migration
+  - image: gcr.io/track-compliance/database-migration
     context: database-migration
     docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dmarc-report
+  - image: gcr.io/track-compliance/dmarc-report
     context: services/dmarc-report
     docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-processor
+  - image: gcr.io/track-compliance/dns-processor
     context: scanners/dns-processor
     docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-scanner
+  - image: gcr.io/track-compliance/dns-scanner
     context: scanners/dns-scanner
     docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-dispatcher
+  - image: gcr.io/track-compliance/domain-dispatcher
     context: scanners/domain-dispatcher
     docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend
+  - image: gcr.io/track-compliance/frontend
     context: frontend
     docker: {}
-#  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/https-processor
+#  - image: gcr.io/track-compliance/https-processor
 #    context: scanners/https-processor
 #    docker: {}
-#  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/https-scanner
+#  - image: gcr.io/track-compliance/https-scanner
 #    context: scanners/https-scanner
 #    docker: {}
-#  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-processor
+#  - image: gcr.io/track-compliance/log4shell-processor
 #    context: scanners/log4shell-processor
 #    docker: {}
-#  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-scanner
+#  - image: gcr.io/track-compliance/log4shell-scanner
 #    context: scanners/log4shell-scanner
 #    docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/guidance
+  - image: gcr.io/track-compliance/services/guidance
     context: services/guidance
     docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/summaries
+  - image: gcr.io/track-compliance/services/summaries
     context: services/summaries
     docker: {}
-#  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/spring4shell-scanner
+#  - image: gcr.io/track-compliance/spring4shell-scanner
 #    context: scanners/spring4shell
 #    docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/super-admin
+  - image: gcr.io/track-compliance/super-admin
     context: services/super-admin
     docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-processor
+  - image: gcr.io/track-compliance/web-processor
     context: scanners/web-processor
     docker: {}
-  - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-scanner
+  - image: gcr.io/track-compliance/web-scanner
     context: scanners/web-scanner
     docker: {}
 #deploy: