diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 42effcf..c7607d5 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -17,7 +17,7 @@
 
 ## Chart version for package:
 ##   Increment when Chart.yaml changes
-version: "2.12.6"
+version: "2.12.7"
 description: "A Helm chart for Voltha OpenOLT Adapter"
 keywords:
   - "onf"
@@ -35,6 +35,6 @@
     url: "https://www.opennetworking.org"
 
 # appVersion refers to release version of voltha-openolt-adapter
-appVersion: "4.4.11"
+appVersion: "4.5.3"
 
 # [EOF]
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index ca3a5cb..bd1f6fb 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -120,7 +120,8 @@
             - "--adapter_endpoint={{ tpl .Values.adapter_open_olt.endpoints.address . }}.{{ .Release.Namespace }}.svc:{{ print .Values.adapter_open_olt.endpoints.port }}"
             - "--kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}"
             - "--event_topic={{ .Values.adapter_open_olt.topics.event_topic }}"
-            - "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
+            - "--kv_store_type={{ tpl .Values.services.kvstore.type . }}"
+            - "--kv_store_address={{ tpl .Values.services.kvstore.address . }}"
             - "--kv_store_request_timeout={{ tpl .Values.adapter_open_olt.kv_store_timeout . }}"
             - "--heartbeat_check_interval={{ tpl .Values.adapter_open_olt.heartbeat_check_interval . }}"
             - "--heartbeat_fail_interval={{ tpl .Values.adapter_open_olt.heartbeat_fail_interval . }}"
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 585f45c..aed777c 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -77,8 +77,10 @@
     cluster:
       address: kafka:9092
 
-  # Define connectivity to etcd
-  etcd:
+  # Define connectivity to kvstore
+  kvstore:
+    # type: etcd, redis or redis-sentinel
+    type: etcd
     address: etcd:2379
 
   # Define Tracing Agent connection details