diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index d16d84d..7c85984 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -17,4 +17,4 @@
 description: A Helm chart for Voltha OpenONU Adapter
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.3.6
+version: 2.3.7
\ No newline at end of file
diff --git a/voltha-adapter-openonu/templates/adapters-openonu.yaml b/voltha-adapter-openonu/templates/adapters-openonu.yaml
index feb5666..f7ffa94 100644
--- a/voltha-adapter-openonu/templates/adapters-openonu.yaml
+++ b/voltha-adapter-openonu/templates/adapters-openonu.yaml
@@ -71,8 +71,9 @@
           - "REPLICA_ID=$(echo $VOLTHA_POD_NAME | grep -o '.$') && REPLICA_ID=$((REPLICA_ID + 1)) && echo $REPLICA_ID && python /voltha/adapters/brcm_openomci_onu/main.py
               --kafka_adapter={{ .Values.services.kafka.adapter.service }}:{{ .Values.services.kafka.adapter.port }}
               --kafka_cluster={{ .Values.services.kafka.cluster.service }}:{{ .Values.services.kafka.cluster.port }}
-              --core_topic=rwcore
-              --name=brcm_openomci_onu
+              --core_topic={{ .Values.defaults.topics.core_topic }}
+              --adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}
+              --name={{ .Values.defaults.topics.adapter_open_onu_topic }}
               --backend=etcd
               --etcd={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}
               --probe=:8080
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 0edccb2..0097619 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -22,6 +22,10 @@
   image_tag: ~
   image_org: "voltha/"
   image_pullPolicy: "Always"
+  topics:
+    core_topic: "rwcore"
+    adapter_open_onu_topic: "brcm_openomci_onu"
+    adapter_open_olt_topic: "openolt"
 
 # Define connectivity to required services
 services: