diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 3da5757..bf011aa 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -314,11 +314,6 @@
             kubectl exec \$OF_AGENT -- mv /usr/sbin/tcpdump /usr/bin/tcpdump
             _TAG=ofagent-tcpdump kubectl exec \$OF_AGENT -- tcpdump -nei eth0 -w out.pcap&
 
-            # Start the tcp-dump in bbsim
-            export BBSIM=\$(kubectl get pods -l app=bbsim -o name)
-            _TAG=bbsim-nni kubectl exec \$BBSIM -- tcpdump -nei nni -w nni.pcap&
-            _TAG=bbsim-upstream kubectl exec \$BBSIM -- tcpdump -nei upstream -w upstream.pcap&
-
             # Start the tcp-dump in radius
             export RADIUS=\$(kubectl get pods -l app=radius -o name)
             kubectl exec \$RADIUS -- apt-get update
@@ -448,16 +443,6 @@
             kill -9 \$P_ID
           fi
 
-          # stop bbsim tcpdump
-          P_ID="\$(ps e -ww -A | grep "_TAG=bbsim-nni" | grep -v grep | awk '{print \$1}')"
-          if [ -n "\$P_ID" ]; then
-            kill -9 \$P_ID
-          fi
-          P_ID="\$(ps e -ww -A | grep "_TAG=bbsim-upstream" | grep -v grep | awk '{print \$1}')"
-          if [ -n "\$P_ID" ]; then
-            kill -9 \$P_ID
-          fi
-
           # stop radius tcpdump
           P_ID="\$(ps e -ww -A | grep "_TAG=radius-tcpdump" | grep -v grep | awk '{print \$1}')"
           if [ -n "\$P_ID" ]; then
@@ -478,10 +463,6 @@
           export OF_AGENT=$(kubectl get pods -l app=ofagent | awk 'NR==2{print $1}') || true
           kubectl cp $OF_AGENT:out.pcap $LOG_FOLDER/ofagent.pcap || true
 
-          export BBSIM=$(kubectl get pods -l app=bbsim | awk 'NR==2{print $1}') || true
-          kubectl cp $BBSIM:nni.pcap $LOG_FOLDER/bbsim-nni.pcap || true
-          kubectl cp $BBSIM:upstream.pcap $LOG_FOLDER/bbsim-upstream.pcap || true
-
           export RADIUS=$(kubectl get pods -l app=radius | awk 'NR==2{print $1}') || true
           kubectl cp $RADIUS:out.pcap $LOG_FOLDER/radius.pcap || true
 
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index beeb748..4838fa9 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -69,8 +69,6 @@
           atomixReplicas: 3
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
           withPcap: true
-          bbsimImg: matteoscandolo/bbsim:dummy-dhcp
-          onosImg: matteoscandolo/voltha-onos:olt-logs
 
 
       # jobs for 512 ONUs with a 8 openonu-adapters and clustered ONOS (1 OLT)
@@ -92,8 +90,6 @@
           atomixReplicas: 3
           withPcap: true
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
-          bbsimImg: matteoscandolo/bbsim:dummy-dhcp
-          onosImg: matteoscandolo/voltha-onos:olt-logs
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-1-16-32-tt-subscribers'
@@ -113,8 +109,6 @@
           onosReplicas: 3
           atomixReplicas: 3
           withPcap: true
-          bbsimImg: matteoscandolo/bbsim:dummy-dhcp
-          onosImg: matteoscandolo/voltha-onos:olt-logs
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
 
       - 'voltha-scale-measurements':
@@ -135,8 +129,6 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
-          bbsimImg: matteoscandolo/bbsim:dummy-dhcp
-          onosImg: matteoscandolo/voltha-onos:olt-logs
 
       # jobs for 1024 ONUs with a 8 openonu-adapters and clustered ONOS (2 OLTs)
       - 'voltha-scale-measurements':
@@ -157,7 +149,6 @@
           atomixReplicas: 3
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
           withPcap: true
-          bbsimImg: matteoscandolo/bbsim:dummy-dhcp
           onosImg: matteoscandolo/voltha-onos:olt-log
 
       - 'voltha-scale-measurements':
@@ -178,13 +169,31 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
-          bbsimImg: matteoscandolo/bbsim:dummy-dhcp
-          onosImg: matteoscandolo/voltha-onos:olt-logs
+
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
+          'disable-job': false
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          workflow: tt
+          withEapol: false
+          withDhcp: true
+          withIgmp: true
+          openonuAdapterReplicas: 8
+          onosReplicas: 3
+          atomixReplicas: 3
+          withPcap: true
+          extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
 
       # voltha-2.5 Jobs
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.5-1-16-32-att-subscribers'
-          'disable-job': true
+          'disable-job': false
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
           olts: 1
@@ -210,7 +219,7 @@
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.5-2-16-32-dt-subscribers'
-          'disable-job': true
+          'disable-job': false
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
           olts: 2
@@ -236,7 +245,7 @@
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.5-1-16-32-tt-subscribers'
-          'disable-job': true
+          'disable-job': false
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
           olts: 1