diff --git a/full-values.yaml b/full-values.yaml
index c319432..a83fcac 100644
--- a/full-values.yaml
+++ b/full-values.yaml
@@ -113,8 +113,6 @@
 kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
 pon: 1
 onu: 1
-auth: true
-dhcp: true
 
 # SHOCK THE MONKEY OR LET LOSE THE DOGS OF WAR
 # The VOLTHA charts have support for adding extra labels to deployments and
diff --git a/minimal-values.yaml b/minimal-values.yaml
index 16ec3f9..3eea594 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -130,8 +130,6 @@
 kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
 pon: 1
 onu: 1
-auth: true
-dhcp: true
 
 # SHOCK THE MONKEY OR LET LOSE THE DOGS OF WAR
 # The VOLTHA charts have support for adding extra labels to deployments and
diff --git a/voltha b/voltha
index a830ad4..7c3c8f3 100755
--- a/voltha
+++ b/voltha
@@ -1961,6 +1961,16 @@
             espin - "$NOT_VERIFIED"
             S_TAG="$((900+instance))"
             INTERNAL_EXTRA_HELM_INSTALL_ARGS="--set olt_id=$instance,s_tag=$S_TAG"
+            if [ "$WITH_EAPOL" == "yes" ]; then
+                INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set auth=true"
+            else
+                INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set auth=false"
+            fi
+            if [ "$WITH_DHCP" == "yes" ]; then
+                INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set dhcp=true"
+            else
+                INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set dhcp=false"
+            fi
             helm_install - "$BBSIM_NS" "bbsim${instance_num}" "$VOLTHA_BBSIM_CHART" "$VOLTHA_BBSIM_CHART_VERSION" "$_HELM_DESC BBSIM${instance_num}"
             INTERNAL_EXTRA_HELM_INSTALL_ARGS=
         else