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