diff --git a/apps/agent/deployment/ci-cd/helm/values.yaml b/apps/agent/deployment/ci-cd/helm/values.yaml
index bda40cdeb8701eab8a5aa64e6b5c27ba8381e502..39dfbf0461d674857ba7cea3026aae8e658dd5b2 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: ""
@@ -57,21 +57,17 @@ security:
   # -- Group used by the apps .
   runAsGid: 0
 
-ocm: 
+ocm:
   agent:
     ledgers: "BCOVRIN_TEST"
     idunion:
       key: ""
     peer:
-      url: "https://w3c-ocm-dev.vereign.com/issuer"
+      url: "https://ssi-dev.vereign.com/issuer"
     issuer:
-      name: "ISSUER_AGENT"
-      key: "CwNJroKHTSSj3XvE7ZAnuKiTn2C4QkFvxEqfm5rzhNri"
-      did: "000000000000000000000000TCuste89"
-    holder:
-      name: "DEV_AGENT_HOLDER_OCM_4"
-      key: "DEV_AGENT_HOLDER_OCM_4"
-      did: "2000000000000000CCA120000000TCuste21jsjs"
+      name: "AGENT_ISSUER_OCM"
+      key: "CwNJroKHTSSj3XvE7ZAnuKiTn2C1uhuy7234FDCQkFvxEqfm5rzhNri"
+      did: "000000000000003451230000000000TCuste1232289234"
     db:
       host: ""
       user: ""
@@ -88,8 +84,8 @@ ocm:
     name: "ssi_issuer_stream"
     subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
 
-  gateway: 
-    port: 
+  gateway:
+    port:
       http: 8081
       tcp: 8881
     socket:
@@ -103,7 +99,7 @@ ocmtest:
     idunion:
       key: ""
     peer:
-      url: "https://w3c-ocm-dev.vereign.com/holder"
+      url: "https://ssi-dev.vereign.com/holder"
     holder:
       name: "HOLDER_AGENT_OCM"
       key: "CwNJroKHTSSj3XvE7ZAnuKiTn3C4QkFvxEqfm5rsdNri"
@@ -124,8 +120,8 @@ ocmtest:
     name: "ssi_holder_stream"
     subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
 
-  gateway: 
-    port: 
+  gateway:
+    port:
       http: 8081
       tcp: 8881
     socket:
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: ""
diff --git a/libs/nats/src/base.nats.service.ts b/libs/nats/src/base.nats.service.ts
index b57c48c50090d332066446bb5ad64ab9eda40a48..a97a425ee536517cf2fb228788de70eee6a55a78 100644
--- a/libs/nats/src/base.nats.service.ts
+++ b/libs/nats/src/base.nats.service.ts
@@ -7,6 +7,7 @@ import {
   JetStreamManager,
   JSONCodec,
   NatsConnection,
+  NatsError,
   RetentionPolicy,
   StorageType,
   StreamConfig,
@@ -66,7 +67,7 @@ export class NatsBaseService {
         this.jsClient = this.client.jetstream();
         this.jsm = await this.client.jetstreamManager();
 
-        await this.jsm.streams.add(this.streamConfig);
+        await this.registerStream(this.streamConfig);
       },
       {
         retries: 5,
@@ -85,4 +86,19 @@ export class NatsBaseService {
   disconnect = () => {
     return this.client.close();
   };
+
+  private registerStream = async (sconfig: StreamConfig) => {
+    try {
+      return await this.jsm.streams.add(sconfig);
+    } catch (e) {
+      this.logger.log(JSON.stringify(e, null, 2));
+
+      if (e instanceof NatsError && e.api_error?.err_code === 10058) {
+        this.logger.log(`Trying to update ${sconfig.name} stream`);
+        return await this.jsm.streams.update(sconfig.name, sconfig);
+      }
+
+      throw new Error(`RegisterStream failed.`);
+    }
+  };
 }
diff --git a/libs/nats/src/consumer.nats.service.ts b/libs/nats/src/consumer.nats.service.ts
index 88157ea13db32fc6687e64595d2b903f688160c2..d1dfbc4eaa9973f9a42953f433415781bc9ebfea 100644
--- a/libs/nats/src/consumer.nats.service.ts
+++ b/libs/nats/src/consumer.nats.service.ts
@@ -39,7 +39,7 @@ export class ConsumerService extends NatsBaseService {
       return this.jsClient.consumers.get(stream, consumerConfig.name);
     } catch (error) {
       if (error instanceof NatsError && error.code === "409") {
-        this.logger.log("Stream already exists");
+        this.logger.log("Consumer already exists");
         return this.jsClient.consumers.get(stream, consumerConfig.name);
       }