diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index 7aae6f2..234e965 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -72,10 +72,12 @@
         image: '{{ tpl .Values.images.ofagent.registry . }}{{ tpl .Values.images.ofagent.repository . }}:{{ tpl .Values.images.ofagent.tag . }}'
         imagePullPolicy: {{ tpl .Values.images.ofagent.pullPolicy . }}
         env:
-        - name: COMPONENT_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.labels['app.kubernetes.io/name']
+          - name: COMPONENT_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.labels['app.kubernetes.io/name']
+          - name: KV_STORE_DATAPATH_PREFIX
+            value: {{ .Values.defaults.kv_store_data_prefix }}
         args:
         - "/app/ofagent"
         {{- range .Values.services.controller }}