diff --git a/voltha-stack/values.yaml b/voltha-stack/values.yaml
index 68cffdf..ce2e776 100644
--- a/voltha-stack/values.yaml
+++ b/voltha-stack/values.yaml
@@ -84,9 +84,10 @@
   enabled: false
   services:
     kvstore:
-      type: "redis"
-      address: "voltha-infra-redis-headless.{{ .Values.global.voltha_infra_namespace }}.svc.cluster.local"
-      port: "6379"
+      # type: etcd, redis or redis-sentinel
+      type: "etcd"
+      address: "{{ .Values.global.voltha_infra_name }}-etcd.{{ .Values.global.voltha_infra_namespace }}.svc"
+      port: "2379"
     kafka:
       cluster:
         address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"