diff --git a/VERSION b/VERSION
index 2aa5131..7921bd0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.4.7
+3.4.8
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index d093ebd..4bade56 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -34,7 +34,7 @@
 
 ## Chart version for package voltha-stack
 ##   Increment when Chart.yaml changes
-version    : "2.12.14"
+version    : "2.12.15"
 
 # -----------------------------------------------------------------------
 # NOTE: Dependencies are chart versions not component/repository version
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"