diff --git a/environments/kind/cluster.yaml b/environments/kind/cluster.yaml
index abbcdb5203b3db3add1b255b9466b3af28c62162..7677709458da21a05312b72d9a525d1702ac33f7 100644
--- a/environments/kind/cluster.yaml
+++ b/environments/kind/cluster.yaml
@@ -33,4 +33,4 @@ nodes:
   - hostPath: /tmp/kind-oop/mongodb_oeg
     containerPath: /mnt/data/mongodb_oeg
   - hostPath: /tmp/kind-oop/mongodb_fm
-    containerPath: /mnt/data/mongodb_fm
+    containerPath: /mnt/data/mongodb_fm
\ No newline at end of file
diff --git a/oop-platform-chart/charts/oeg/Chart.yaml b/oop-platform-chart/charts/oeg/Chart.yaml
index 01473beb31df9a19df2c3f8b729c220cc9716439..679667cf1fe703f7f4d5ec23135a3c279209d366 100644
--- a/oop-platform-chart/charts/oeg/Chart.yaml
+++ b/oop-platform-chart/charts/oeg/Chart.yaml
@@ -9,7 +9,4 @@ keywords:
   - mongodb
   - controller
 maintainers:
-  - name: DevOps Team
-home: https://github.com/sunriseopenoperatorplatform/oeg
-sources:
-  - https://github.com/sunriseopenoperatorplatform/oeg
+  - name: DevOps Team
\ No newline at end of file
diff --git a/oop-platform-chart/charts/oeg/README.md b/oop-platform-chart/charts/oeg/README.md
index 48371ada163e6225d288b0744179ac46b41b9d1b..5bf640480a313fc0d6a8c0b1304eb2d240f23e00 100644
--- a/oop-platform-chart/charts/oeg/README.md
+++ b/oop-platform-chart/charts/oeg/README.md
@@ -88,6 +88,7 @@ The following environment variables can be configured for the OEG Controller:
 - `FEDERATION_MANAGER_HOST`: Federation manager service URL
 - `PARTNER_API_ROOT`: Partner API root URL
 - `TOKEN_ENDPOINT`: OAuth token endpoint URL
+- `AVAIL_ZONE_NOTIF_LINK`: Available zones URL for status updates
 
 ## Storage Configuration
 
diff --git a/oop-platform-chart/charts/oeg/templates/oegcontroller-deployment.yaml b/oop-platform-chart/charts/oeg/templates/oegcontroller-deployment.yaml
index a10e6ef9c4a59602090295eeaa3d29c5a25ef8c3..8278041341c12f7abc02f8715094907e343db96e 100644
--- a/oop-platform-chart/charts/oeg/templates/oegcontroller-deployment.yaml
+++ b/oop-platform-chart/charts/oeg/templates/oegcontroller-deployment.yaml
@@ -48,6 +48,8 @@ spec:
               value: {{ .Values.oegcontroller.env.partnerApiRoot | quote }}
             - name: TOKEN_ENDPOINT
               value: {{ .Values.oegcontroller.env.tokenEndpoint | quote }}
+            - name: AVAIL_ZONE_NOTIF_LINK
+              value: {{ default "" .Values.oegcontroller.env.availZoneNotifLink | quote }}
           {{- with .Values.oegcontroller.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
diff --git a/oop-platform-chart/charts/oeg/values.yaml b/oop-platform-chart/charts/oeg/values.yaml
index 2b46b96338997f07758e69be68eaa8ca15eadc18..50051aa16c1851da66eda0a173b5192173e9c36b 100644
--- a/oop-platform-chart/charts/oeg/values.yaml
+++ b/oop-platform-chart/charts/oeg/values.yaml
@@ -43,8 +43,8 @@ oegcontroller:
   replicaCount: 1
   
   image:
-    repository: ghcr.io/sunriseopenoperatorplatform/oeg/oeg
-    tag: 1.0.1
+    repository: labs.etsi.org:5050/oop/code/open-exposure-gateway
+    tag: 1.0.0
     pullPolicy: Always
   
   service:
@@ -65,9 +65,10 @@ oegcontroller:
   env:
     mongoUri: "mongodb://oegmongo:27017"
     srmHost: "http://srm:8080/srm/1.0.0"
-    federationManagerHost: "http://federation-manager.federation-manager.svc.cluster.local:8989/operatorplatform/federation/v1"
+    federationManagerHost: "http://federation-manager.oop.svc.cluster.local:8989/operatorplatform/federation/v1"
     partnerApiRoot: "http://10.8.0.1:31002"
-    tokenEndpoint: "http://federation-manager.federation-manager.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token"
+    tokenEndpoint: "http://federation-manager.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token"
+    availZoneNotifLink: ""
 
 # Ingress configuration
 ingress:
diff --git a/oop-platform-chart/charts/srm/Chart.yaml b/oop-platform-chart/charts/srm/Chart.yaml
index b4cf4d216dfd54a64f323c3f35d5bf10f46b0cc2..c94cd4cb29dc64939a7dc06617b2bf033dcb86e0 100644
--- a/oop-platform-chart/charts/srm/Chart.yaml
+++ b/oop-platform-chart/charts/srm/Chart.yaml
@@ -9,5 +9,4 @@ keywords:
   - mongodb
   - sunrise
 maintainers:
-  - name: DevOps Team
-home: https://github.com/sunriseopenoperatorplatform/srm
+  - name: DevOps Team
\ No newline at end of file
diff --git a/oop-platform-chart/charts/srm/values.yaml b/oop-platform-chart/charts/srm/values.yaml
index 1d7fccbc77a7dd9b7277d6792cd1ee23f8259e47..906b82c22aa885318bb04dfbfd53f4de7d2ff2b7 100644
--- a/oop-platform-chart/charts/srm/values.yaml
+++ b/oop-platform-chart/charts/srm/values.yaml
@@ -42,8 +42,8 @@ srmcontroller:
   replicaCount: 1
   
   image:
-    repository: ghcr.io/sunriseopenoperatorplatform/srm/srm
-    tag: 1.0.1
+    repository: labs.etsi.org:5050/oop/code/service-resource-manager
+    tag: 1.0.0
     pullPolicy: Always
   
   service:
diff --git a/oop-platform-chart/values.yaml b/oop-platform-chart/values.yaml
index b0444e4f3afdb5a8f9aa1388ea07d4fb685ddcb1..b8b508c05260bf08bb47de69dc0005be8f7fa689 100644
--- a/oop-platform-chart/values.yaml
+++ b/oop-platform-chart/values.yaml
@@ -48,8 +48,8 @@ srm:
     name: srmcontroller
     replicaCount: 1
     image:
-      repository: ghcr.io/sunriseopenoperatorplatform/srm/srm
-      tag: 1.0.1
+      repository: labs.etsi.org:5050/oop/code/service-resource-manager 
+      tag: 1.0.0
       pullPolicy: Always
     service:
       name: srm
@@ -75,6 +75,12 @@ srm:
       edgeCloudAdapterName: kubernetes
       adapterBaseUrl: "kubernetes.default.svc.cluster.local"
       platformProvider: "Local"
+      # Valid values: "oai", "open5gs"
+      networkAdapterName: "oai" 
+      # Example value: "http://<network-adapter-url>"
+      networkAdapterBaseUrl: ""
+      scsAsId: "scs"
+
 
   artifactManager:
     enabled: true
@@ -124,8 +130,8 @@ oeg:
     name: oegcontroller
     replicaCount: 1
     image:
-      repository: ghcr.io/sunriseopenoperatorplatform/oeg/oeg
-      tag: 1.0.1
+      repository: labs.etsi.org:5050/oop/code/open-exposure-gateway 
+      tag: 1.0.0
       pullPolicy: Always
     service:
       name: oeg