revert unicorn to upstream only

values/unicorn-values.yaml

@@ -24,16 +24,16 @@ gitlab:
       tag: v17.5.1
   gitlab-exporter:
     image:
-      repository: cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips
-      tag: 17.5.1
+      repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter
+      tag: v17.5.1
   gitlab-pages:
     image:
-      repository: cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips
-      tag: 17.5.1
+      repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-pages
+      tag: v17.5.1
   gitlab-shell:
     image:
-      repository: cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips
-      tag: 17.5.1
+      repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-shell
+      tag: v17.5.1
   praefect:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
@@ -42,32 +42,33 @@ gitlab:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
       tag: v17.5.1
+
 global:
   certificates:
     image:
-      repository: cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips
-      tag: 17.5.1
+      repository: registry.gitlab.com/gitlab-org/build/cng/certificates
+      tag: v17.5.1
   gitlabBase:
     image:
-      repository: cgr.dev/du-uds-defenseunicorns/gitlab-base-fips
-      tag: 17.5.1
+      repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
+      tag: v17.5.1
   kubectl:
     image:
-      repository: cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips
-      tag: 1.31.2
+      repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
+      tag: v17.5.1
 
 registry:
   image:
-    repository: cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips
-    tag: 17.5.1
+    repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry
+    tag: v17.5.1
 
 shared-secrets:
   selfsign:
     image:
-      repository: cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips
-      tag: 17.5.1
+      repository: registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign
+      tag: v17.5.1
 
 upgradeCheck:
   image:
-    repository: cgr.dev/du-uds-defenseunicorns/gitlab-base-fips
-    tag: 17.5.1
+    repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
+    tag: v17.5.1

zarf.yaml

@@ -113,16 +113,16 @@ components:
         valuesFiles:
           - values/unicorn-values.yaml
     images:
-      - "cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips:17.5.1"
-      - "cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips:17.5.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.5.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.5.1"
       - "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.5.1"
-      - "cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips:17.5.1"
-      - "cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips:17.5.1"
-      - "cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips:17.5.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v17.5.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-pages:v17.5.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v17.5.1"
       - "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.5.1"
       - "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.5.1"
       - "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.5.1"
       - "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.5.1"
-      - "cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips:1.31.2"
-      - "cgr.dev/du-uds-defenseunicorns/gitlab-base-fips:17.5.1"
-      - "cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips:17.5.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.5.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-base:v17.5.1"
+      - "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.5.1"