diff --git a/minimal-values.yaml b/minimal-values.yaml
index 735ba1c..8cebab4 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -41,3 +41,5 @@
 
 # Customization for BBSIM
 kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1
diff --git a/voltha b/voltha
index 1a0d608..1338914 100755
--- a/voltha
+++ b/voltha
@@ -177,14 +177,16 @@
         fi
     else
         EXISTS=$(helm list -q)
-        EXPECT="etcd-operator onos open-olt open-onu sim voltha"
+        EXPECT="etcd-operator onos open-olt open-onu sim voltha bbsim"
         INTERSECT=
         for i in $EXISTS; do
             if [ $(echo $EXPECT | grep -c $i) -eq 1 ]; then
                 HAVE="$HAVE $i"
             fi
         done
-        ./bin/helm delete --purge $HAVE
+        if [ "$HAVE X" != " X" ]; then
+            ./bin/helm delete --purge $HAVE
+        fi
 fi
     exit 
 fi