diff --git a/minimal-values.yaml b/minimal-values.yaml
index fdf4614..226ed8f 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -70,11 +70,11 @@
 #    tag: master
 # START_OFAGENT_GO - Comment the following block to use the Python implementation
 # of the ofagent
-#  ofagent:
+#  ofagent_go:
 #    repository: voltha/voltha-ofagent-go
 #    tag: master
 # END_OFAGENT_GO
-#  ofagent:
+#  ofagent_py:
 #    repository: voltha/voltha-ofagent-py
 #    tag: 2.1.1
 #  rw_core:
diff --git a/voltha b/voltha
index 9706535..3a5e89f 100755
--- a/voltha
+++ b/voltha
@@ -256,6 +256,10 @@
     WITH_KAFKA \
     WITH_ETCD \
     WITH_ONOS \
+    VOLTHA_NS \
+    ADAPTER_NS \
+    INFRA_NS \
+    BBSIM_NS \
     "
 
 # Iterate over yes/no configuration options and validate
@@ -1618,7 +1622,7 @@
     INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set services.controller.service=$_HOST --set services.controller.port=$_PORT"
 fi
 bspin "Verify VOLTHA installed $HIGH_VOLTAGE"
-if [ $(helm list --deployed --short --namespace $VOLTHA_NS "^$VOLTHA_NS\$" | wc -l) -ne 1 ]; then
+if [ $(helm list --deployed --short --namespace $VOLTHA_NS "^voltha\$" | wc -l) -ne 1 ]; then
     espin $NOT_VERIFIED
     helm_install - $VOLTHA_NS voltha $VOLTHA_CHART $VOLTHA_CHART_VERSION "Install VOLTHA Core"
 else