diff --git a/apps/agent/deployment/ci-cd/helm/templates/ingress.yaml b/apps/agent/deployment/ci-cd/helm/templates/ingress.yaml
index 6ec5cb0df5ded928bcb88614972c9eee17b6df84..39fd7c1db20771e369eda54b21fe33a7305914d1 100644
--- a/apps/agent/deployment/ci-cd/helm/templates/ingress.yaml
+++ b/apps/agent/deployment/ci-cd/helm/templates/ingress.yaml
@@ -26,7 +26,7 @@ spec:
               service:
                 name: {{ template "app.name" . }}
                 port:
-                  number: {{ .Values.service.port }}
+                  number: {{ .Values.service.port1 }}
     {{- else if eq .Release.Namespace "ocm-test" }}
     - host: {{ .Values.ingress.frontendDomain }}
       http:
diff --git a/apps/attestation-manager/deployment/ci-cd/helm/values.yaml b/apps/attestation-manager/deployment/ci-cd/helm/values.yaml
index 72119b1a14ccdfd42f905cf1ee2a31fa66534031..b6838724afadb1d63c5dee8b3407d1bc3518e1ee 100644
--- a/apps/attestation-manager/deployment/ci-cd/helm/values.yaml
+++ b/apps/attestation-manager/deployment/ci-cd/helm/values.yaml
@@ -94,7 +94,7 @@ ocm:
       host: "attestation-manager.ocm"
   nats:
     server: "nats.ocm:4222"
-    name: "ssi_holder_stream"
+    name: "ssi_issuer_stream"
     subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
 
 ocmtest: 
diff --git a/apps/connection-manager/deployment/ci-cd/helm/values.yaml b/apps/connection-manager/deployment/ci-cd/helm/values.yaml
index 027af89f48e3c8374fba3527eba138aa767b0f54..b3b778778f759ff6ccd4c4fb1f9975065f59b54b 100644
--- a/apps/connection-manager/deployment/ci-cd/helm/values.yaml
+++ b/apps/connection-manager/deployment/ci-cd/helm/values.yaml
@@ -94,7 +94,7 @@ ocm:
       host: "connection-manager.ocm"
   nats:
     server: "nats.ocm:4222"
-    name: "ssi_holder_stream"
+    name: "ssi_issuer_stream"
     subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
 
 ocmtest: 
diff --git a/apps/proof-manager/README.md b/apps/proof-manager/README.md
index d363a69dbb4b090e67280d8d6e2bed71c88584d9..1d63365490087b3f174ae8c69dfe3a5d32789d5e 100644
--- a/apps/proof-manager/README.md
+++ b/apps/proof-manager/README.md
@@ -1,4 +1,4 @@
-# OCM ENGINE - Proof Manager
+# OCM ENGINE - Proof Managert 
 
 Internal service.
 
diff --git a/apps/proof-manager/deployment/ci-cd/helm/values.yaml b/apps/proof-manager/deployment/ci-cd/helm/values.yaml
index 45d6df61fbec8fba07f48526b4ee58bdb4cdedae..375934437673c9fdc80d33eb88778cae662f9556 100644
--- a/apps/proof-manager/deployment/ci-cd/helm/values.yaml
+++ b/apps/proof-manager/deployment/ci-cd/helm/values.yaml
@@ -90,18 +90,18 @@ ocm:
   proofManager:
     service:
       tcp:
-        port: 8883
+        port: 8884
       host: "proof-manager.ocm"
   nats:
     server: "nats.ocm:4222"
-    name: "ssi_holder_stream"
+    name: "ssi_issuer_stream"
     subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
 
 ocmtest: 
   proofManager:
     service:
       tcp:
-        port: 8883
+        port: 8884
       host: "proof-manager.ocm-test"
   nats:
     server: "nats.ocm-test:4222"
diff --git a/libs/nats/src/base.nats.service.ts b/libs/nats/src/base.nats.service.ts
index a97a425ee536517cf2fb228788de70eee6a55a78..da003db1b19e73a82e879b05148a430f005cd9a6 100644
--- a/libs/nats/src/base.nats.service.ts
+++ b/libs/nats/src/base.nats.service.ts
@@ -93,7 +93,10 @@ export class NatsBaseService {
     } catch (e) {
       this.logger.log(JSON.stringify(e, null, 2));
 
-      if (e instanceof NatsError && e.api_error?.err_code === 10058) {
+      if (
+        (e instanceof NatsError && e.api_error?.err_code === 10058) ||
+        (e instanceof NatsError && e.api_error?.err_code === 10065)
+      ) {
         this.logger.log(`Trying to update ${sconfig.name} stream`);
         return await this.jsm.streams.update(sconfig.name, sconfig);
       }