diff --git a/voltha-go-controller/Chart.yaml b/voltha-go-controller/Chart.yaml
index a8ea3b2..559557e 100644
--- a/voltha-go-controller/Chart.yaml
+++ b/voltha-go-controller/Chart.yaml
@@ -20,13 +20,13 @@
 # -----------------------------------------------------------------------
 
 # appVersion refers to release version of voltha-go-controller
-appVersion: "1.0"
+appVersion: "0.0.2"
 
 description: A Helm chart for Kubernetes
 name: voltha-go-controller
 
 ## Chart version for package voltha-stack
 ##   Increment when Chart.yaml changes
-version: "0.1.4"
+version: "0.1.5"
 
 # [EOF]
diff --git a/voltha-go-controller/templates/deployment.yaml b/voltha-go-controller/templates/deployment.yaml
index 7eaa7d1..39655f8 100644
--- a/voltha-go-controller/templates/deployment.yaml
+++ b/voltha-go-controller/templates/deployment.yaml
@@ -43,11 +43,11 @@
         - name: VOLTHA_PORT
           value: "55555"
         - name: KV_STORE_TYPE
-          value: "redis"
+          value: "{{ .Values.services.kvstore.type }}"
         - name: KV_STORE_HOST
-          value: "voltha-infra-redis-headless.{{ .Values.global.voltha_infra_namespace }}.svc.cluster.local"
+          value: "{{ .Values.services.kvstore.address }}"
         - name: KV_STORE_PORT
-          value: "6379"
+          value: "{{ .Values.services.kvstore.port }}"
         - name: KAFKA_ADAPTER_HOST
           value: "{{ tpl .Values.services.kafka.cluster.address . }}"
         - name: KAFKA_ADAPTER_PORT
diff --git a/voltha-go-controller/values.yaml b/voltha-go-controller/values.yaml
index 5b33839..54bd9bd 100644
--- a/voltha-go-controller/values.yaml
+++ b/voltha-go-controller/values.yaml
@@ -109,3 +109,8 @@
   kafka:
     cluster:
       address: kafka:9092
+  kvstore:
+    # type: etcd, redis or redis-sentinel
+    type: "redis"
+    address: "voltha-infra-redis-headless.{{ .Values.global.voltha_infra_namespace }}.svc.cluster.local"
+    port: "6379"