diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index 0300f5d..a2bcce0 100644
--- a/omec/omec-control-plane/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -10,4 +10,4 @@
 name: omec-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.6.20
+version: 0.6.21
diff --git a/omec/omec-control-plane/templates/statefulset-mme.yaml b/omec/omec-control-plane/templates/statefulset-mme.yaml
index 0a47593..688879e 100644
--- a/omec/omec-control-plane/templates/statefulset-mme.yaml
+++ b/omec/omec-control-plane/templates/statefulset-mme.yaml
@@ -127,6 +127,10 @@
               fieldPath: status.podIP
         - name: MMERUNENV
           value: "container"
+      {{- if .Values.config.managedByConfigPod.enabled }}
+        - name: MANAGED_BY_CONFIG_POD
+          value: "true"
+      {{- end }}
         volumeMounts:
         - name: scripts
           mountPath: /opt/mme/scripts
@@ -158,6 +162,10 @@
         env:
         - name: MMERUNENV
           value: "container"
+      {{- if .Values.config.managedByConfigPod.enabled }}
+        - name: MANAGED_BY_CONFIG_POD
+          value: "true"
+      {{- end }}
         volumeMounts:
         - name: scripts
           mountPath: /opt/mme/scripts
@@ -189,6 +197,10 @@
         env:
         - name: MMERUNENV
           value: "container"
+      {{- if .Values.config.managedByConfigPod.enabled }}
+        - name: MANAGED_BY_CONFIG_POD
+          value: "true"
+      {{- end }}
         volumeMounts:
         - name: scripts
           mountPath: /opt/mme/scripts
@@ -218,6 +230,10 @@
         env:
         - name: MMERUNENV
           value: "container"
+      {{- if .Values.config.managedByConfigPod.enabled }}
+        - name: MANAGED_BY_CONFIG_POD
+          value: "true"
+      {{- end }}
         volumeMounts:
         - name: scripts
           mountPath: /opt/mme/scripts
diff --git a/omec/omec-control-plane/values.yaml b/omec/omec-control-plane/values.yaml
index fc9a8e4..64b0933 100644
--- a/omec/omec-control-plane/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -107,6 +107,8 @@
   coreDump:
     enabled: true
     path: /tmp/coredump
+  managedByConfigPod:      # config comes from helm by default, if enabled true, then discard
+    enabled: false         # helm chart config and use the config from config Pod
   useExistingConfigMap: false
   logger:
     WEBUI:
@@ -144,9 +146,9 @@
             #- type: mmeapp
             #  configPushUrl: "http://mme-app-config:8080/v1/config/slice"
             #  configCheckUrl: "http://mme-app-config:8080/v1/config-check"
-            #- type: mmes1ap
-            #  configPushUrl: "http://mme-s1ap-config:8080/v1/config/slice"
-            #  configCheckUrl: "http://mme-s1ap-config:8080/v1/config-check"
+            - type: mme-s1ap
+              configPushUrl: "http://mme:8081/v1/config/slice"
+              configCheckUrl: "http://mme:8081/v1/config-check"
             - type: hss
               configPushUrl: "http://hss:8080/v2/config/imsis"
               configCheckUrl: "http://hss:8080/v2/config-check"
@@ -428,14 +430,6 @@
           group_id: 1
           code: 1
           logging: debug
-          mcc:
-            dig1: 2
-            dig2: 0
-            dig3: 8
-          mnc:
-            dig1: 0
-            dig2: 1
-            dig3: -1
           plmnlist:
             #plmn1 is aether common plmn, plmn2 is for aether-in-a-box
             plmn1: "mcc=315,mnc=010"