diff --git a/jjb/pipeline/voltha/master/physical-build.groovy b/jjb/pipeline/voltha/master/physical-build.groovy
index 6f6f9f9..47c9907 100644
--- a/jjb/pipeline/voltha/master/physical-build.groovy
+++ b/jjb/pipeline/voltha/master/physical-build.groovy
@@ -108,10 +108,7 @@
             "--set onos-classic.onosOfPort=31653 " +
             "--set onos-classic.individualOpenFlowNodePorts=true "
 
-
-            def bbsimReplica = 0
-            if (installBBSim.toBoolean()) {
-              bbsimReplica = 1
+            if (bbsimReplicas.toInteger() != 0) {
               localHelmFlags = localHelmFlags + " --set onu=${onuNumber},pon=${ponNumber} "
             }
 
@@ -127,7 +124,7 @@
               atomixReplica: params.NumOfAtomix,
               kafkaReplica: params.NumOfKafka,
               etcdReplica: params.NumOfEtcd,
-              bbsimReplica: bbsimReplica.toInteger(),
+              bbsimReplica: bbsimReplicas.toInteger(),
               ])
           }
           sh """