diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index d0d7977..241d78f 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -16,5 +16,5 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.0.1
+version: 1.0.2
 appVersion: latest
diff --git a/voltha/requirements.yaml b/voltha/requirements.yaml
index b4f3bdc..241c094 100644
--- a/voltha/requirements.yaml
+++ b/voltha/requirements.yaml
@@ -14,11 +14,7 @@
 # limitations under the License.
 
 dependencies:
-- name: etcd-operator
-  version: 0.7.7
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: etcd.operator.enabled
-- name: consul
-  version: 1.3.5
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: consul.enabled
+- name: etcd-cluster
+  version: 0.1.1
+  repository: file://../etcd-cluster
+  condition: etcd.cluster.enabled
diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index d2d876f..44b0103 100644
--- a/voltha/templates/_helpers.tpl
+++ b/voltha/templates/_helpers.tpl
@@ -16,7 +16,7 @@
 
 {{- define "voltha-vcore.cmd" }}
 - "voltha/voltha/main.py"
-- "--etcd=etcd-cluster.default.svc.cluster.local:2379"
+- "--etcd={{ .Values.etcdReleaseName }}.default.svc.cluster.local:2379"
 - "--kafka={{ .Values.kafkaReleaseName }}.default.svc.cluster.local"
 - "--rest-port=8880"
 - "--grpc-port=50556"
diff --git a/voltha/templates/envoy_for_etcd.yaml b/voltha/templates/envoy_for_etcd.yaml
index 92092bc..5966076 100644
--- a/voltha/templates/envoy_for_etcd.yaml
+++ b/voltha/templates/envoy_for_etcd.yaml
@@ -58,7 +58,7 @@
             - "-envoy-cfg-template=/envoy/voltha-grpc-proxy.template.json"
             - "-envoy-config=/envoy/voltha-grpc-proxy.json"
             - "-kv=etcd"
-            - "-kv-svc-name=etcd-cluster.default.svc.cluster.local"
+            - "-kv-svc-name={{ .Values.etcdReleaseName }}.default.svc.cluster.local"
             - "-kv-port=2379"
           ports:
             - containerPort: 8882
diff --git a/voltha/templates/freeradius-config.yaml b/voltha/templates/freeradius-config.yaml
index 2e54c5e..92229d8 100644
--- a/voltha/templates/freeradius-config.yaml
+++ b/voltha/templates/freeradius-config.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- if .Values.freeradius.enabled }}
 apiVersion: v1
 data:
   clients.conf: |
@@ -26,3 +27,4 @@
   name: freeradius-config
   namespace: {{ .Values.global.namespace }}
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
+{{- end}}
diff --git a/voltha/templates/freeradius.yaml b/voltha/templates/freeradius.yaml
index 8f9eaea..ef86b16 100644
--- a/voltha/templates/freeradius.yaml
+++ b/voltha/templates/freeradius.yaml
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- if .Values.freeradius.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -91,3 +92,4 @@
         - name: freeradius-config
           configMap:
             name: freeradius-config
+{{- end}}
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 81fe079..6237196 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -45,18 +45,14 @@
           targetPort: 50555
 
 etcd:
-  operator:
+  cluster:
     enabled: true
 
-etcd-operator:
-  customResources:
-    createEtcdClusterCRD: true
+freeradius:
+  enabled: true
 
 kafkaReleaseName: cord-kafka
-etcdReleaseName: voltha-etcd
-
-consul:
-  enabled: false
+etcdReleaseName: etcd-cluster
 
 images:
   vcore: