diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 1757df4..326165d 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -10,7 +10,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.8.5
+version: 0.8.6
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index c0e482e..fd96d28 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -444,10 +444,15 @@
       amfcfg.conf:
         info:
           version: 1.0.0
-          description: AMF initial local configuration
+          description: AMF initial configuration
         configuration:
           amfDBName: sdcore_amf
           enableDBStore: false
+          debugProfilePort: 5001
+          kafkaInfo:
+            brokerUri: "sd-core-kafka-headless"
+            brokerPort: 9092
+            topicName: "sdcore-data-source-amf"
           ngapIpList:
             - "0.0.0.0"
           amfName: AMF
@@ -584,6 +589,11 @@
         configuration:
           smfDBName: sdcore_smf
           enableDBStore: false
+          debugProfilePort: 5001
+          kafkaInfo:
+            brokerUri: "sd-core-kafka-headless"
+            brokerPort: 9092
+            topicName: "sdcore-data-source-smf"
           pfcp:
              addr: "POD_IP"
           smfName: SMF
@@ -674,27 +684,34 @@
       port: 9089
     cfgFiles:
       metricscfg.conf:
-        info:
-          version: 1.0.0
-          description: Metrics initial local configuration
-        logger:
-          logLevel: "debug"
         configuration:
-          nfStream:
-            urls:
-              - "sd-core-kafka-headless:9092"
-            topic:
-              name: "sdcore-nf-data-source"
-              group:
-                analytics: "analytics"
-                mongodb: "mongodb"
-                restapi: "restapi"
-                prometheus: "prometheus"
-          analyticsStream:
-            enable: true
-            urls:
-               - "sd-core-kafka-headless:9092"
-            topic: "sdcore-analytics-feed"
+          nfStreams:
+            - topic:
+                topicGroup: analytics
+                topicName: sdcore-data-source-amf
+              urls:
+                - uri: "sd-core-kafka-headless"
+                  port: 9092
+            - topic:
+                topicGroup: analytics
+                topicName: sdcore-data-source-smf
+              urls:
+                - uri: "sd-core-kafka-headless"
+                  port: 9092
+          prometheusServer:
+            addr: POD_IP
+            port: 9089
+          apiServer:
+            addr: POD_IP
+            port: 9301
+          debugProfileServer:
+            addr: POD_IP
+            port: 5001
+        info:
+          description: Metrics initial local configuration
+          version: 1.0.0
+        logger:
+          level: info
   upfadapter:
     deploy: false
     serviceType: ClusterIP