diff --git a/voltha-go-controller/Chart.yaml b/voltha-go-controller/Chart.yaml
index 2e40067..a866dbe 100644
--- a/voltha-go-controller/Chart.yaml
+++ b/voltha-go-controller/Chart.yaml
@@ -27,6 +27,6 @@
 
 ## Chart version for package voltha-stack
 ##   Increment when Chart.yaml changes
-version: "0.1.7"
+version: "0.1.8"
 
 # [EOF]
diff --git a/voltha-go-controller/templates/_helpers.tpl b/voltha-go-controller/templates/_helpers.tpl
new file mode 100644
index 0000000..affd530
--- /dev/null
+++ b/voltha-go-controller/templates/_helpers.tpl
@@ -0,0 +1,24 @@
+# Copyright 2020-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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{/* Expand the name of the chart. */}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/* Create a default fully qualified app name. We truncate at 63 chars because . . . */}}
+{{- define "fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullNameOverride -}}
+{{- $fullname | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/voltha-go-controller/templates/deployment.yaml b/voltha-go-controller/templates/deployment.yaml
index 8b28dc8..fab2f2d 100644
--- a/voltha-go-controller/templates/deployment.yaml
+++ b/voltha-go-controller/templates/deployment.yaml
@@ -16,6 +16,7 @@
 kind: Deployment
 metadata:
   name: "{{ .Chart.Name }}"
+  namespace: "{{ .Release.Namespace }}"
   labels:
     release: {{ .Release.Name }}
 spec:
@@ -43,11 +44,9 @@
             fieldRef:
               fieldPath: status.podIP
         - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
+          value: {{ .Release.Namespace }}
         - name: VOLTHA_HOST
-          value: "$(NAMESPACE)-voltha-api.$(NAMESPACE).svc.cluster.local"
+          value: "{{ .Release.Namespace }}-voltha-api.{{ .Release.Namespace }}.svc.cluster.local"
         - name: VOLTHA_PORT
           value: "55555"
         - name: KV_STORE_TYPE
@@ -61,7 +60,7 @@
         - name: KAFKA_ADAPTER_PORT
           value: "9092"
         - name: LOG_LEVEL
-          value: .Values.global.log_level
+          value: "{{ .Values.global.log_level }}"
         - name: KV_STORE_TIMEOUT
           value: "3000000000"
         - name: DEVICE_SYNC_DURATION
diff --git a/voltha-go-controller/values.yaml b/voltha-go-controller/values.yaml
index f52276f..0d0e659 100644
--- a/voltha-go-controller/values.yaml
+++ b/voltha-go-controller/values.yaml
@@ -118,6 +118,6 @@
       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"
+    type: "etcd"
+    address: "voltha-infra-etcd-headless.infra.svc.cluster.local"
+    port: "2379"