diff --git a/nem-monitoring/templates/exporter-deployment.yaml b/nem-monitoring/templates/exporter-deployment.yaml
index 5147c64..530d952 100644
--- a/nem-monitoring/templates/exporter-deployment.yaml
+++ b/nem-monitoring/templates/exporter-deployment.yaml
@@ -29,8 +29,8 @@
     spec:
       containers:
         - name: kpi-exporter
-          image: {{ tpl .Values.nem_voltha_kpi_exporter_image . | quote }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          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 }}"]
           ports:
             - containerPort: 8080
diff --git a/nem-monitoring/values.yaml b/nem-monitoring/values.yaml
index 886e502..1719a3e 100644
--- a/nem-monitoring/values.yaml
+++ b/nem-monitoring/values.yaml
@@ -13,10 +13,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-nem_voltha_kpi_exporter_image: "opencord/kafka-topic-exporter:latest"
+global:
+  registry: ''
+
+images:
+  voltha_kpi_exporter:
+    repository: 'opencord/kafka-topic-exporter'
+    tag: 'latest'
+    pullPolicy: 'Always'
+
 nem_voltha_kpi_exporter_nodePort: 31080
 nem_voltha_kpi_exporter_replicas: 2
-imagePullPolicy: "Always"
+
 args:
   voltha_kpi_broker: cord-kafka:9092
 
@@ -210,4 +218,4 @@
           type: prometheus
           url: http://nem-monitoring-prometheus-server.default.svc.cluster.local
           access: proxy
-          isDefault: true
\ No newline at end of file
+          isDefault: true