diff --git a/voltha/requirements.yaml b/voltha/requirements.yaml
index cef6629..946ac26 100644
--- a/voltha/requirements.yaml
+++ b/voltha/requirements.yaml
@@ -14,7 +14,7 @@
 
 dependencies:
 - name: etcd-operator
-  version: 0.8.0
+  version: 0.7.3
   repository: https://kubernetes-charts.storage.googleapis.com/
   condition: etcd.operator.enabled
 - name: consul
diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
deleted file mode 100644
index bc4f720..0000000
--- a/voltha/templates/_helpers.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-{{- /*
-Copyright 2017-present Open Networking Foundation
-
-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.
-*/ -}}
-
-{{- define "voltha-shovel.cmd" }}
-- "/shovel/shovel/main.py"
-- "--kafka={{ .Values.kafkaReleaseName }}-kafka.default.svc.cluster.local"
-- "--host=grafana.voltha.svc.cluster.local"
-- "--topic=voltha.kpis"
-{{- end }}
-
-{{- define "voltha-dashd.cmd" }}
-- "/dashd/dashd/main.py"
-- "--kafka={{ .Values.kafkaReleaseName }}-kafka.default.svc.cluster.local"
-- "--grafana_url=http://admin:admin@grafana.$(NAMESPACE).svc.cluster.local:80/api"
-- "--topic=voltha.kpis"
-{{- end }}
-
-{{- define "voltha-vcore.cmd" }}
-- "voltha/voltha/main.py"
-- "-v"
-- "--etcd=etcd-cluster.default.svc.cluster.local:2379"
-- "--kafka={{ .Values.kafkaReleaseName }}-kafka.default.svc.cluster.local"
-- "--rest-port=8880"
-- "--grpc-port=50556"
-- "--interface=eth1"
-- "--backend=etcd"
-- "--pon-subnet=10.38.0.0/12"
-- "--ponsim-comm=grpc"
-{{- end }}
-
-{{- define "xos-core.initial_data" }}
-- model: core.Site
-  fields:
-    name: {{ .Values.cordSiteName | quote }}
-    abbreviated_name: {{ .Values.cordSiteName | quote }}
-    login_base: {{ .Values.cordSiteName | quote }}
-    site_url: "http://opencord.org/"
-    hosts_nodes: true
-
-- model: core.User
-  fields:
-    email: {{ .Values.xosAdminUser | quote }}
-    password: {{ .Values.xosAdminPassword | quote }}
-    firstname: {{ .Values.xosAdminFirstname | quote }}
-    lastname:  {{ .Values.xosAdminLastname | quote }}
-    is_admin: true
-  relations:
-    site:
-      fields:
-        name: {{ .Values.cordSiteName | quote }}
-      model: core.Site
-{{- end }}
-
-{{- define "xos-core.ca_cert_chain" }}
-{{ .Values.ca_cert_chain | b64dec }}
-{{- end }}
-
diff --git a/voltha/templates/stats.yaml b/voltha/templates/stats.yaml
index 6e187b4..51511a8 100644
--- a/voltha/templates/stats.yaml
+++ b/voltha/templates/stats.yaml
@@ -39,8 +39,11 @@
             fieldRef:
               fieldPath: metadata.namespace
         args:
-{{ include "voltha-dashd.cmd" . | indent 8 }}
-
+        - "/dashd/dashd/main.py"
+        - "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"
+        - "--grafana_url=http://admin:admin@grafana.$(NAMESPACE).svc.cluster.local:80/api"
+        - "--topic=voltha.kpis"
+        #- "--consul=consul:8500"
 ---
 #
 # The shovel deployment
@@ -69,4 +72,8 @@
             fieldRef:
               fieldPath: metadata.namespace
         args:
-{{ include "voltha-shovel.cmd" . | indent 8 }}
\ No newline at end of file
+        - "/shovel/shovel/main.py"
+        - "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"
+        - "--host=grafana.voltha.svc.cluster.local"
+        - "--topic=voltha.kpis"
+        #- "--consul=consul:8500"
\ No newline at end of file
diff --git a/voltha/templates/vcore_for_etcd.yaml b/voltha/templates/vcore_for_etcd.yaml
index c660760..7f02fe0 100644
--- a/voltha/templates/vcore_for_etcd.yaml
+++ b/voltha/templates/vcore_for_etcd.yaml
@@ -61,7 +61,16 @@
                 fieldRef:
                   fieldPath: metadata.namespace
           args:
-{{ include "voltha-vcore.cmd" . | indent 12 }}
+            - "voltha/voltha/main.py"
+            - "-v"
+            - "--etcd=etcd-cluster.default.svc.cluster.local:2379"
+            - "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"
+            - "--rest-port=8880"
+            - "--grpc-port=50556"
+            - "--interface=eth1"
+            - "--backend=etcd"
+            - "--pon-subnet=10.38.0.0/12"
+            - "--ponsim-comm=grpc"
           ports:
             - containerPort: 8880
               name: rest-port
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 32616d1..4cc250f 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -47,28 +47,10 @@
           port: 50555
           targetPort: 50555
 
-kafka:
-  enabled: false
-  persistence:
-    enabled: false
-  zookeeper:
-    persistence:
-      enabled: false
-
-etcd:
-  operator:
-    enabled: true
 etcd-operator:
   customResources:
-    size: 1
     createEtcdClusterCRD: true
 
-kafkaReleaseName: voltha-kafka
-etcdReleaseName: voltha-etcd
-
-consul:
-  enabled: false
-
 envoyForEtcdImage: 'voltha/voltha-envoy:latest'
 freeradiusImage: 'tpdock/freeradius:latest'
 grafanaImage: 'kamon/grafana_graphite:3.0'
@@ -79,10 +61,39 @@
 vcliImage: 'voltha/voltha-cli:latest'
 vcoreImage: 'voltha/voltha-voltha:latest'
 
+kafka:
+  enabled: true
+  persistence:
+    enabled: false
+  zookeeper:
+    persistence:
+      enabled: false
+etcd:
+  operator:
+    enabled: true
+consul:
+  enabled: false
+
+
 # Need the namespace global for kafka
 global:
   namespace: voltha
 
+stats:
+  #dashd_args:
+  #- "/dashd/dashd/main.py"
+  #- "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"
+  #- "--grafana_url=http://admin:admin@grafana.$(NAMESPACE).svc.cluster.local:80/api"
+  #- "--topic=voltha.kpis"
+  #- "--consul=consul:8500"
+
+  #shovel_args:
+  #- "/shovel/shovel/main.py"
+  #- "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"
+  #- "--host=grafana.voltha.svc.cluster.local"
+  #- "--topic=voltha.kpis"
+  #- "--consul=consul:8500"
+
 vcli_args:
 - "/cli/cli/setup.sh"
 - "-C consul:8500"
@@ -90,6 +101,18 @@
 - "-s voltha:18880"
 - "-G"
 
+#vcore_etcd_args:
+#- "voltha/voltha/main.py"
+#- "-v"
+#- "--etcd=etcd-restore-operator.default.svc.cluster.local:2379"
+#- "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"
+#- "--rest-port=8880"
+#- "--grpc-port=50556"
+#- "--interface=eth1"
+#- "--backend=etcd"
+#- "--pon-subnet=10.38.0.0/12"
+#- "--ponsim-comm=grpc"
+
 ofagent_args:
 - "/ofagent/ofagent/main.py"
 - "-v"