canada-ca · FestiveKyle · Feb 21, 2024 · Feb 21, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,19 +1,19 @@
 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
     args: ['sync', '-d', '--bare']
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ers/auto-image-update/bases/image-repo-policies/add-domain-to-easm-image-repo-policy.yaml b/...ers/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
@@ -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
@@ -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/...clusters/auto-image-update/bases/image-repo-policies/dns-processor-image-repo-policy.yaml b/...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
@@ -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/...lusters/auto-image-update/bases/image-repo-policies/domain-cleanup-image-repo-policy.yaml b/...lusters/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/...sters/auto-image-update/bases/image-repo-policies/domain-discovery-image-repo-policy.yaml b/...sters/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/...ters/auto-image-update/bases/image-repo-policies/domain-dispatcher-image-repo-policy.yaml b/...ters/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
@@ -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/...s/auto-image-update/bases/image-repo-policies/frontend-maintenance-image-repo-policy.yaml b/...s/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
@@ -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/...uto-image-update/bases/image-repo-policies/label-known-easm-assets-image-repo-policy.yaml b/...uto-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/...rs/auto-image-update/bases/image-repo-policies/log4shell-processor-image-repo-policy.yaml b/...rs/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/...ters/auto-image-update/bases/image-repo-policies/log4shell-scanner-image-repo-policy.yaml b/...ters/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/...clusters/auto-image-update/bases/image-repo-policies/org-footprint-image-repo-policy.yaml b/...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/...usters/auto-image-update/bases/image-repo-policies/progress-report-image-repo-policy.yaml b/...usters/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/...s/auto-image-update/bases/image-repo-policies/spring4shell-scanner-image-repo-policy.yaml b/...s/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
@@ -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
@@ -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/...sters/auto-image-update/bases/image-repo-policies/update-selectors-image-repo-policy.yaml b/...sters/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/...clusters/auto-image-update/bases/image-repo-policies/web-processor-image-repo-policy.yaml b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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