diff --git a/jjb/pipeline/voltha/master/physical-build.groovy b/jjb/pipeline/voltha/master/physical-build.groovy
index 49fd221..c791e91 100644
--- a/jjb/pipeline/voltha/master/physical-build.groovy
+++ b/jjb/pipeline/voltha/master/physical-build.groovy
@@ -109,7 +109,7 @@
             "--set onos-classic.individualOpenFlowNodePorts=true "
 
             def bbsimReplica = 0
-            if (installBBSim) {
+            if (installBBSim.toBoolean()) {
               bbsimReplica = 1
               extraHelmFlags = extraHelmFlags + " --set onu=${onuNumber},pon=${ponNumber} "
             }
@@ -122,7 +122,7 @@
               onosReplica: params.NumOfOnos,
               atomixReplica: params.NumOfAtomix,
               kafkaReplica: params.NumOfKafka,
-              etcdReplica: params.NumOfAtomix,
+              etcdReplica: params.NumOfEtcd,
               bbsimReplica: bbsimReplica.toInteger(),
               ])
           }
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index bd0f342..7ba8dbb 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -214,6 +214,8 @@
     profile: 'Default'
     logLevel: 'DEBUG'
     installBBSim: false
+    num-of-onus: 0
+    num-of-ponports: 0
 
     <<: *voltha-build-job-parameters
 
@@ -250,6 +252,8 @@
     profile: 'Default'
     logLevel: 'DEBUG'
     installBBSim: false
+    num-of-onus: 0
+    num-of-ponports: 0
 
     <<: *voltha-build-job-parameters
 
@@ -281,6 +285,8 @@
     volthaHelmChartsChange: '' # this is not supported in the VOLTHA-2.7 build, but the parameters are shared, ideally we should split them
     logLevel: 'DEBUG'
     installBBSim: false
+    num-of-onus: 0
+    num-of-ponports: 0
     num-of-kafka: 1
     num-of-etcd: 1