diff --git a/jjb/pipeline/voltha-system-test-bbsim.groovy b/jjb/pipeline/voltha-system-test-bbsim.groovy
index b81f670..991ecee 100644
--- a/jjb/pipeline/voltha-system-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-system-test-bbsim.groovy
@@ -40,6 +40,8 @@
     CONFIG_SADIS="external"
     BBSIM_CFG="configs/bbsim-sadis-att.yaml"
     ROBOT_MISC_ARGS="-d $WORKSPACE/RobotLogs"
+    NUM_OF_ETCD=3
+    SCHEDULE_ON_CONTROL_NODES="y"
   }
 
   stages {
@@ -74,7 +76,7 @@
              echo "on master, using default settings for kind-voltha"
            fi
 
-           EXTRA_HELM_FLAGS+="${params.extraHelmFlags} --set voltha-etcd-cluster.clusterSize=3 "
+           EXTRA_HELM_FLAGS+="${params.extraHelmFlags} "
            echo \$EXTRA_HELM_FLAGS
 
            pushd kind-voltha/