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
diff --git a/nem-monitoring/templates/exporter-deployment.yaml b/nem-monitoring/templates/exporter-deployment.yaml
index acad8e4..1611239 100644
--- a/nem-monitoring/templates/exporter-deployment.yaml
+++ b/nem-monitoring/templates/exporter-deployment.yaml
@@ -20,7 +20,7 @@
   labels:
     release: {{ .Release.Name }}
 spec:
-  replicas: {{ .Values.nem_voltha_kpi_exporter_replicas }}
+  replicas: {{ .Values.kpi_exporter.nem_kpi_exporter_replicas }}
   template:
     metadata:
       labels:
@@ -29,9 +29,9 @@
     spec:
       containers:
         - name: kpi-exporter
-          image:  "{{ .Values.global.registry }}{{ .Values.images.voltha_kpi_exporter.repository }}:{{ tpl .Values.images.voltha_kpi_exporter.tag . }}"
-          imagePullPolicy: "{{ .Values.images.voltha_kpi_exporter.pullPolicy }}"
-          args: ["-broker={{ .Values.args.voltha_kpi_broker }}"]
+          image:  "{{ .Values.global.registry }}{{ .Values.images.kpi_exporter.repository }}:{{ tpl .Values.images.kpi_exporter.tag . }}"
+          imagePullPolicy: "{{ .Values.images.kpi_exporter.pullPolicy }}"
+          args: ["-broker={{ .Values.kpi_exporter.kpi_broker }}"]
           ports:
             - containerPort: 8080
               port: 8080
diff --git a/nem-monitoring/templates/exporter-service.yaml b/nem-monitoring/templates/exporter-service.yaml
index f5fcee2..f29a913 100644
--- a/nem-monitoring/templates/exporter-service.yaml
+++ b/nem-monitoring/templates/exporter-service.yaml
@@ -24,7 +24,7 @@
   ports:
     - port: 8080
       targetPort: 8080
-      nodePort: {{ .Values.nem_voltha_kpi_exporter_nodePort }}
+      nodePort: {{ .Values.kpi_exporter.nem_kpi_exporter_nodePort }}
       protocol: TCP
   selector:
     app: "kpi-exporter"