diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index b9be148..ed64f26 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -134,7 +134,7 @@
       - 'build_voltha_pod_test':
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
-          'disable-job': true
+          'disable-job': false
           release: '2.5'
           branch: 'voltha-2.5'
           power-switch: True
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index ee224d4..d80ca34 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -272,11 +272,14 @@
 
           # Start the tcp-dump in ofagent
           if [ ${withPcap} = true ] ; then
-            export OF_AGENT=$(kubectl get pods -l app=ofagent | awk 'NR==2{print $1}')
+            export OF_AGENT=$(kubectl get pods -l app=ofagent -o name)
             kubectl exec $OF_AGENT -- apk update
             kubectl exec $OF_AGENT -- apk add tcpdump
             kubectl exec $OF_AGENT -- mv /usr/sbin/tcpdump /usr/bin/tcpdump
             _TAG=ofagent-tcpdump kubectl exec $OF_AGENT -- tcpdump -nei eth0 -w out.pcap&
+
+            export BBSIM=$(kubectl get pods -l app=bbsim -o name)
+            _TAG=bbsim-tcpdump kubectl exec $BBSIM -- tcpdump -nei nni -w out.pcap&
           fi
         '''
       }
@@ -391,9 +394,18 @@
             kill -9 \$P_ID
           fi
 
+          # stop bbsim tcpdump
+          P_ID="\$(ps e -ww -A | grep "_TAG=bbsim-tcpdump" | grep -v grep | awk '{print \$1}')"
+          if [ -n "\$P_ID" ]; then
+            kill -9 \$P_ID
+          fi
+
           # copy the file
           export OF_AGENT=$(kubectl get pods -l app=ofagent | awk 'NR==2{print $1}')
           kubectl cp $OF_AGENT:out.pcap $LOG_FOLDER/ofagent.pcap
+
+          export BBSIM=$(kubectl get pods -l app=bbsim | awk 'NR==2{print $1}')
+          kubectl cp $BBSIM:out.pcap $LOG_FOLDER/bbsim.pcap
         fi
 
         cd voltha-system-tests
@@ -489,7 +501,7 @@
       '''
       // collect etcd metrics
       sh '''
-        mkdir $WORKSPACE/etcd-metrics
+        mkdir -p $WORKSPACE/etcd-metrics
         curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_debugging_mvcc_keys_total' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-key-count.json || true
         curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=grpc_server_handled_total{grpc_service="etcdserverpb.KV"}' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-rpc-count.json || true
         curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_debugging_mvcc_db_total_size_in_bytes' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-db-size.json || true
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index a1a94de..3508997 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -80,24 +80,6 @@
           withPcap: true
 
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-master-2-8-32-tt-subscribers'
-          build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/4 * * *"
-          olts: 2
-          pons: 4
-          onus: 8
-          withFlows: true
-          provisionSubscribers: true
-          workflow: tt
-          withEapol: false
-          withDhcp: true
-          withIgmp: true
-          openonuAdapterReplicas: 8
-          onosReplicas: 3
-          atomixReplicas: 3
-          extraHelmFlags: '--set defaults.rw_core.timeout=30s '
-
-      - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-1-16-32-tt-subscribers'
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
@@ -207,9 +189,9 @@
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
 
-      # voltha-2.4 Jobs
+      # voltha-2.5 Jobs
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-voltha-2.4-1-16-32-att-subscribers'
+          name: 'voltha-scale-measurements-voltha-2.5-1-16-32-att-subscribers'
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
           olts: 1
@@ -224,8 +206,7 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
-          release: voltha-2.4
-          karafHome: apache-karaf-4.2.8
+          release: voltha-2.5
           bbsimImg: ''
           rwCoreImg: ''
           ofAgentImg: ''
@@ -235,7 +216,7 @@
           withPcap: true
 
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-voltha-2.4-2-16-32-dt-subscribers'
+          name: 'voltha-scale-measurements-voltha-2.5-2-16-32-dt-subscribers'
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
           olts: 2
@@ -251,8 +232,7 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
-          release: voltha-2.4
-          karafHome: apache-karaf-4.2.8
+          release: voltha-2.5
           bbsimImg: ''
           rwCoreImg: ''
           ofAgentImg: ''
@@ -260,6 +240,32 @@
           openonuAdapterImg: ''
           onosImg: ''
 
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-voltha-2.5-1-16-32-tt-subscribers'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          olts: 1
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          workflow: tt
+          withEapol: false
+          withDhcp: true
+          withIgmp: true
+          openonuAdapterReplicas: 8
+          onosReplicas: 3
+          atomixReplicas: 3
+          extraHelmFlags: '--set defaults.rw_core.timeout=30s '
+          release: voltha-2.5
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          onosImg: ''
+          withPcap: true
+
       # development pipeline
       - 'voltha-scale-measurements-dev':
           name: 'voltha-scale-measurements-master-dev'
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 4b80119..8997dd2 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -91,8 +91,6 @@
         enchant \
         ethtool \
         git \
-        git-crypt \
-        gnupg \
         golang-1.12-go \
         graphviz \
         jq \
@@ -147,19 +145,19 @@
         git-review \
         graphviz \
         grpcio-tools \
-        httpie==1.0.3 \
+        httpie==0.9.* \
         isort \
         git+https://github.com/linkchecker/linkchecker.git@v9.4.0 \
         more-itertools==5.0.0 \
-        mock \
+        mock==2.0.* \
         netaddr \
         ndg-httpsclient \
-        nose2 \
+        nose2==0.9.* \
         pyopenssl \
         pexpect \
         pylint==1.* \
-        pyyaml \
-        requests \
+        pyyaml==3.10.* \
+        requests==2.14.* \
         robotframework \
         robotframework-httplibrary \
         robotframework-kafkalibrary \