diff --git a/apps/agent/deployment/ci-cd/helm/values.yaml b/apps/agent/deployment/ci-cd/helm/values.yaml
index 28ee2029c1f36c1964103dfbc12592a435bd8d49..3c1413d66ad002fcfdbd25fe3ab439e48656607f 100644
--- a/apps/agent/deployment/ci-cd/helm/values.yaml
+++ b/apps/agent/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: agent
 nameOverride: ""
 
 image:
-  repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+  repository: eu.gcr.io/vrgn-infra-prj
   # -- Image name .
-  name: ocm-engine/agent
+  name: gaiax/ocm/ocm-engine/agent
   # -- Image tag .
   # Uses .Chart.AppVersion if empty .
   tag: ""
diff --git a/apps/attestation-manager/deployment/ci-cd/helm/values.yaml b/apps/attestation-manager/deployment/ci-cd/helm/values.yaml
index df3da09f513b1b250c814635991719513e1b1c0b..72119b1a14ccdfd42f905cf1ee2a31fa66534031 100644
--- a/apps/attestation-manager/deployment/ci-cd/helm/values.yaml
+++ b/apps/attestation-manager/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: attestation-manager
 nameOverride: ""
 
 image:
-  repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+  repository: eu.gcr.io/vrgn-infra-prj
   # -- Image name
-  name: ocm-engine/attestation-manager
+  name: gaiax/ocm/ocm-engine/attestation-manager
   # -- Image tag
   # Uses .Chart.AppVersion if empty
   tag: ""
diff --git a/apps/connection-manager/deployment/ci-cd/helm/values.yaml b/apps/connection-manager/deployment/ci-cd/helm/values.yaml
index 051acf536180850220aa86ec5e002f877e9c6e84..027af89f48e3c8374fba3527eba138aa767b0f54 100644
--- a/apps/connection-manager/deployment/ci-cd/helm/values.yaml
+++ b/apps/connection-manager/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: connection-manager
 nameOverride: ""
 
 image:
-  repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+  repository: eu.gcr.io/vrgn-infra-prj
   # -- Image name
-  name: ocm-engine/connection-manager
+  name: gaiax/ocm/ocm-engine/connection-manager
   # -- Image tag
   # Uses .Chart.AppVersion if empty
   tag: ""
diff --git a/apps/gateway/deployment/ci-cd/helm/values.yaml b/apps/gateway/deployment/ci-cd/helm/values.yaml
index 589109d0daed7f6b30883239785cd78e0a8653fa..fd7d1261eaed39eecd12826f1a3fa8fd2a989f11 100644
--- a/apps/gateway/deployment/ci-cd/helm/values.yaml
+++ b/apps/gateway/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: gateway
 nameOverride: ""
 
 image:
-  repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+  repository: eu.gcr.io/vrgn-infra-prj
   # -- Image name
-  name: ocm-engine/gateway
+  name: gaiax/ocm/ocm-engine/gateway
   # -- Image tag
   # Uses .Chart.AppVersion if empty
   tag: ""
diff --git a/apps/proof-manager/deployment/ci-cd/helm/values.yaml b/apps/proof-manager/deployment/ci-cd/helm/values.yaml
index 320de2f0f211c1ee0c6669647480a5c1fdc6743a..45d6df61fbec8fba07f48526b4ee58bdb4cdedae 100644
--- a/apps/proof-manager/deployment/ci-cd/helm/values.yaml
+++ b/apps/proof-manager/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: proof-manager
 nameOverride: ""
 
 image:
-  repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+  repository: eu.gcr.io/vrgn-infra-prj
   # -- Image name
-  name: ocm-engine/proof-manager
+  name: gaiax/ocm/ocm-engine/proof-manager
   # -- Image tag
   # Uses .Chart.AppVersion if empty
   tag: ""