diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index a796dd7..ca848eb 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 ## Chart version for package: 'voltha'
 ##   Increment when Chart.yaml changes
-version: "2.12.19"
+version: "2.12.20"
 
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
@@ -37,6 +37,6 @@
 
 # app version is NOT used in this chart for application versions or image tags
 # but represents the voltha release version itself
-appVersion: "2.12"
+appVersion: "3.6.1"
 
 # [EOF]
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 2a948b1..12afcdd 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -86,8 +86,8 @@
               value: {{ tpl .Values.rw_core.kv_store_data_prefix . }}
           args:
             - "/app/rw_core"
-            - "--kv_store_type=etcd"
-            - "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
+            - "--kv_store_type={{ tpl .Values.services.kvstore.type . }}"
+            - "--kv_store_address={{ tpl .Values.services.kvstore.address . }}"
             - "--grpc_nbi_address=0.0.0.0:50057"
             - "--grpc_sbi_address=0.0.0.0:50058"
             - "--banner"
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index d85e85c..918fd31 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -99,8 +99,8 @@
         - "--controller={{ tpl .address $ }}"
         {{- end }}
         - "--voltha={{ template "fullname" . }}-api.{{ .Release.Namespace }}.svc:55555"
-        - "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
-        - "--kv_store_type=etcd"
+        - "--kv_store_type={{ tpl .Values.services.kvstore.type . }}"
+        - "--kv_store_address={{ tpl .Values.services.kvstore.address . }}"
         - "--kv_store_request_timeout=60s"
         - "--log_level={{ $log_level }}"
         - "--device-refresh-interval={{ .Values.ofagent.device_refresh_interval }}"
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 7a601e3..8712f7e 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -59,8 +59,10 @@
     cluster:
       address: kafka:9092
 
-  # Define connectivity to etcd
-  etcd:
+  # Define connectivity to kv store
+  kvstore:
+    # type: etcd, redis or redis-sentinel
+    type: etcd
     address: etcd:2379
 
   # Define Tracing Agent connection details