diff --git a/VERSION b/VERSION
index b347b11..161fb7d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.3
+3.2.3-dev
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 88a7005..1edb483 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -27,11 +27,11 @@
     url: "https://www.opennetworking.org"
 name: voltha-stack
 appVersion: "2.12"
-version: 2.12.1
+version: 2.12.2
 dependencies:
   - name: voltha
     repository: file://../voltha
-    version: 2.12.2
+    version: 2.12.3
     condition: voltha.enabled
   - name: voltha-adapter-openonu
     repository: file://../voltha-adapter-openonu
diff --git a/voltha-stack/values.yaml b/voltha-stack/values.yaml
index d4daa2e..fd5887e 100644
--- a/voltha-stack/values.yaml
+++ b/voltha-stack/values.yaml
@@ -35,6 +35,9 @@
   rw_core:
     kv_store_data_prefix: 'service/voltha/{{ .Release.Name }}_{{ .Values.global.stack_name }}'
     stack_id: "{{ .Values.global.stack_name }}"
+  ofagent:
+    kv_store_data_prefix: 'service/voltha/{{ .Release.Name }}_{{ .Values.global.stack_name }}'
+    stack_id: "{{ .Values.global.stack_name }}"
   services:
     kafka:
       cluster:
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 7599a91..3967d09 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.12.2"
+version: "2.12.3"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index fef182d..8eb1308 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -86,6 +86,8 @@
             valueFrom:
               fieldRef:
                 fieldPath: metadata.labels['app.kubernetes.io/name']
+          - name: KV_STORE_DATAPATH_PREFIX
+            value: {{ tpl .Values.ofagent.kv_store_data_prefix . }}
         args:
         - "/app/ofagent"
         {{- if eq (len .Values.services.controller) 0 }}
@@ -97,7 +99,7 @@
         - "--controller={{ tpl .address $ }}"
         {{- end }}
         - "--voltha={{ template "fullname" . }}-api.{{ .Release.Namespace }}.svc:55555"
-        - "--kv_store_address={{ .Values.services.etcd.address }}"
+        - "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
         - "--kv_store_type=etcd"
         - "--kv_store_request_timeout=60s"
         - "--log_level={{ $log_level }}"
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 61a5f41..319bab8 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -102,6 +102,7 @@
 ofagent:
   log_level: '{{ .Values.global.log_level }}'
   device_refresh_interval: '15s'
+  kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
 
 # Define Docker images to be used
 images: