diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index bad852b..7604d34 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.8
+version: 0.8.9
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index 7565b6c..0c9823a 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -111,9 +111,15 @@
 
 kafka:
   deploy: false
+  fullnameOverride: kafka
+  zookeeper:
+    persistence:
+      enabled: false
+  persistence:
+    enabled: false
   nfKafka:
     urls:
-      - "sd-core-kafka-headless:9092"
+      - "kafka-headless:9092"
     topic: "sdcore-nf-data-source"
 
 mongodb:
@@ -450,7 +456,7 @@
           enableDBStore: false
           debugProfilePort: 5001
           kafkaInfo:
-            brokerUri: "sd-core-kafka-headless"
+            brokerUri: "kafka-headless"
             brokerPort: 9092
             topicName: "sdcore-data-source-amf"
           ngapIpList:
@@ -591,7 +597,7 @@
           enableDBStore: false
           debugProfilePort: 5001
           kafkaInfo:
-            brokerUri: "sd-core-kafka-headless"
+            brokerUri: "kafka-headless"
             brokerPort: 9092
             topicName: "sdcore-data-source-smf"
           pfcp:
@@ -690,13 +696,13 @@
                 topicGroup: analytics
                 topicName: sdcore-data-source-amf
               urls:
-                - uri: "sd-core-kafka-headless"
+                - uri: "kafka-headless"
                   port: 9092
             - topic:
                 topicGroup: analytics
                 topicName: sdcore-data-source-smf
               urls:
-                - uri: "sd-core-kafka-headless"
+                - uri: "kafka-headless"
                   port: 9092
           prometheusServer:
             addr: POD_IP