diff --git a/bases/environments/stages/dev/hello_app_cluster/automatic_updates/catalog.yaml b/bases/environments/stages/dev/hello_app_cluster/automatic_updates/catalog.yaml
index 1172539a..fe90cd65 100644
--- a/bases/environments/stages/dev/hello_app_cluster/automatic_updates/catalog.yaml
+++ b/bases/environments/stages/dev/hello_app_cluster/automatic_updates/catalog.yaml
@@ -9,9 +9,9 @@ spec:
   description: giantswarm-catalog-oci
   logoURL: "https://avatars.githubusercontent.com/u/7556340?s=60&v=4"
   repositories:
-    - URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+    - URL: oci://gsoci.azurecr.io/charts/giantswarm/
       type: helm
   storage:
-    URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+    URL: oci://gsoci.azurecr.io/charts/giantswarm/
     type: helm
   title: giantswarm-catalog-oci
diff --git a/bases/environments/stages/dev/hello_app_cluster/imagerepositories.yaml b/bases/environments/stages/dev/hello_app_cluster/imagerepositories.yaml
index 09e380ef..6e754764 100644
--- a/bases/environments/stages/dev/hello_app_cluster/imagerepositories.yaml
+++ b/bases/environments/stages/dev/hello_app_cluster/imagerepositories.yaml
@@ -5,7 +5,7 @@ metadata:
   name: ${cluster_name}-hello-app
   namespace: org-${organization}
 spec:
-  image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
+  image: gsoci.azurecr.io/charts/giantswarm/hello-world
   interval: 10m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1beta2
diff --git a/bases/environments/stages/staging/hello_app_cluster/automatic_updates/catalog.yaml b/bases/environments/stages/staging/hello_app_cluster/automatic_updates/catalog.yaml
index 1172539a..fe90cd65 100644
--- a/bases/environments/stages/staging/hello_app_cluster/automatic_updates/catalog.yaml
+++ b/bases/environments/stages/staging/hello_app_cluster/automatic_updates/catalog.yaml
@@ -9,9 +9,9 @@ spec:
   description: giantswarm-catalog-oci
   logoURL: "https://avatars.githubusercontent.com/u/7556340?s=60&v=4"
   repositories:
-    - URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+    - URL: oci://gsoci.azurecr.io/charts/giantswarm/
       type: helm
   storage:
-    URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+    URL: oci://gsoci.azurecr.io/charts/giantswarm/
     type: helm
   title: giantswarm-catalog-oci
diff --git a/bases/environments/stages/staging/hello_app_cluster/imagerepositories.yaml b/bases/environments/stages/staging/hello_app_cluster/imagerepositories.yaml
index 09e380ef..6e754764 100644
--- a/bases/environments/stages/staging/hello_app_cluster/imagerepositories.yaml
+++ b/bases/environments/stages/staging/hello_app_cluster/imagerepositories.yaml
@@ -5,7 +5,7 @@ metadata:
   name: ${cluster_name}-hello-app
   namespace: org-${organization}
 spec:
-  image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
+  image: gsoci.azurecr.io/charts/giantswarm/hello-world
   interval: 10m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1beta2
diff --git a/docs/add_wc_environments.md b/docs/add_wc_environments.md
index 188e410a..27da6413 100644
--- a/docs/add_wc_environments.md
+++ b/docs/add_wc_environments.md
@@ -176,7 +176,7 @@ spec:
   description: giantswarm-catalog-oci
   logoURL: "https://avatars.githubusercontent.com/u/7556340?s=60&v=4"
   storage:
-    URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+    URL: oci://gsoci.azurecr.io/charts/giantswarm/
     type: helm
   title: giantswarm-catalog-oci
 EOF
@@ -223,7 +223,7 @@ where to look for updates stored in: [imagerepositories.yaml](
 /bases/environments/stages/dev/hello_app_cluster/imagerepositories.yaml).
 
 Let's tell Flux to look for available images for the `hello-world-app`
-in the `giantswarmpublic.azurecr.io/giantswarm-catalog` registry every 10 minutes.
+in the `gsoci.azurecr.io/charts/giantswarm` registry every 10 minutes.
 
 ```sh
 cat <<EOF > imagerepositories.yaml
@@ -234,7 +234,7 @@ metadata:
   name: \${cluster_name}-hello-app
   namespace: org-\${organization}
 spec:
-  image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
+  image: gsoci.azurecr.io/charts/giantswarm/hello-world
   interval: 10m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1beta2
diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml
index 3adbfade..ec2b9a0d 100644
--- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml
+++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml
@@ -4,5 +4,5 @@ metadata:
   name: ${cluster_name}-hello-world
   namespace: org-${organization}
 spec:
-  image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
+  image: gsoci.azurecr.io/charts/giantswarm/hello-world
   interval: 30m0s
diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/automatic-updates/catalog.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/automatic-updates/catalog.yaml
index cd2091dd..43c8f803 100644
--- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/automatic-updates/catalog.yaml
+++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_FLUX_APP/mapi/automatic-updates/catalog.yaml
@@ -12,6 +12,6 @@ spec:
     - URL: https://giantswarm.github.io/giantswarm-catalog/
       type: helm
   storage:
-    URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+    URL: oci://gsoci.azurecr.io/charts/giantswarm/
     type: helm
   title: giantswarm-catalog-oci
diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml
index 3adbfade..ec2b9a0d 100644
--- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml
+++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/apps/hello-world-automatic-updates/imagerepository.yaml
@@ -4,5 +4,5 @@ metadata:
   name: ${cluster_name}-hello-world
   namespace: org-${organization}
 spec:
-  image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
+  image: gsoci.azurecr.io/charts/giantswarm/hello-world
   interval: 30m0s
diff --git a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/automatic-updates/catalog.yaml b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/automatic-updates/catalog.yaml
index cd2091dd..43c8f803 100644
--- a/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/automatic-updates/catalog.yaml
+++ b/management-clusters/MC_NAME/organizations/ORG_NAME/workload-clusters/WC_NAME_OUT_OF_BAND_NO_FLUX_APP/mapi/automatic-updates/catalog.yaml
@@ -12,6 +12,6 @@ spec:
     - URL: https://giantswarm.github.io/giantswarm-catalog/
       type: helm
   storage:
-    URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+    URL: oci://gsoci.azurecr.io/charts/giantswarm/
     type: helm
   title: giantswarm-catalog-oci
diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/catalogs.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/catalogs.yaml
index 28237617..a725b158 100644
--- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/catalogs.yaml
+++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/catalogs.yaml
@@ -7,9 +7,9 @@ spec:
   description: giantswarm-catalog-oci
   logoURL: https://avatars.githubusercontent.com/u/7556340?s=60&v=4
   repositories:
-  - URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+  - URL: oci://gsoci.azurecr.io/charts/giantswarm/
     type: helm
   storage:
-    URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+    URL: oci://gsoci.azurecr.io/charts/giantswarm/
     type: helm
   title: giantswarm-catalog-oci
diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagerepositories.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagerepositories.yaml
index fdfa0bb8..143901a0 100644
--- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagerepositories.yaml
+++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-dev-1/imagerepositories.yaml
@@ -5,7 +5,7 @@ metadata:
   name: hello-app-dev-1-hello-app
   namespace: org-org-name
 spec:
-  image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
+  image: gsoci.azurecr.io/charts/giantswarm/hello-world
   interval: 10m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1beta2
diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/catalogs.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/catalogs.yaml
index 28237617..a725b158 100644
--- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/catalogs.yaml
+++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/catalogs.yaml
@@ -7,9 +7,9 @@ spec:
   description: giantswarm-catalog-oci
   logoURL: https://avatars.githubusercontent.com/u/7556340?s=60&v=4
   repositories:
-  - URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+  - URL: oci://gsoci.azurecr.io/charts/giantswarm/
     type: helm
   storage:
-    URL: oci://giantswarmpublic.azurecr.io/giantswarm-catalog/
+    URL: oci://gsoci.azurecr.io/charts/giantswarm/
     type: helm
   title: giantswarm-catalog-oci
diff --git a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagerepositories.yaml b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagerepositories.yaml
index 5f5bba3e..b6b144f6 100644
--- a/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagerepositories.yaml
+++ b/tests/ats/assertions/exists/organizations/workload-clusters/hello-app-staging-1/imagerepositories.yaml
@@ -5,7 +5,7 @@ metadata:
   name: hello-app-staging-1-hello-app
   namespace: org-org-name
 spec:
-  image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
+  image: gsoci.azurecr.io/charts/giantswarm/hello-world
   interval: 10m0s
 ---
 apiVersion: image.toolkit.fluxcd.io/v1beta2