diff --git a/nem-monitoring/templates/_helpers.tpl b/nem-monitoring/templates/_helpers.tpl
index c1565c1..9b0b99b 100644
--- a/nem-monitoring/templates/_helpers.tpl
+++ b/nem-monitoring/templates/_helpers.tpl
@@ -19,15 +19,13 @@
 ---
 broker:
   name: broker-name
-  host: {{ .Values.args.voltha_kpi_broker }}
+  host: {{ .Values.kpi_exporter.kpi_broker }}
   description: The kafka broker
-  topics:
-    - onos.aaa.stats.kpis
-    - onos.kpis
-    - voltha.kpis
+  topics: {{ range .Values.kpi_exporter.topics }}
+    - {{ . }} {{ end }}
 logger:
   loglevel: info
-  host: {{ .Values.args.voltha_kpi_broker }}
+  host: {{ .Values.kpi_exporter.kpi_broker }}
 target:
   type: prometheus-target
   name: http-server