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: