diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index daf5232..dc738e7 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -382,7 +382,6 @@
             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&
 
             # Start the tcp-dump in radius
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index dc1ef7b..5348d8f 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -61,10 +61,11 @@
           withEapol: true
           withDhcp: true
           withIgmp: false
-          extraHelmFlags: '--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn --set global.rpc_timeout=30s --set voltha.ofagent.log_level=DEBUG'
+          extraHelmFlags: '--set voltha.securityContext.enabled=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn --set global.rpc_timeout=30s --set voltha.ofagent.log_level=DEBUG'
           onosReplicas: 1
           atomixReplicas: 1
           onosImg: andreacampanella/voltha-onos:extend-timeout
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:scale-debug
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-onu-upgrade-2-16-32-att-onus'
@@ -95,10 +96,11 @@
           withEapol: false
           withDhcp: false
           withIgmp: false
-          extraHelmFlags: '-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn'
+          extraHelmFlags: '--set voltha.securityContext.enabled=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn'
           onosReplicas: 1
           atomixReplicas: 1
           onosImg: andreacampanella/voltha-onos:extend-timeout
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:scale-debug
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
@@ -113,13 +115,16 @@
           withEapol: false
           withDhcp: true
           withIgmp: true
-          onosReplicas: 3
-          atomixReplicas: 3
           extraHelmFlags: >
+            --set voltha.securityContext.enabled=false
             --set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn
             --set global.rpc_timeout=30s,global.adapter_open_onu.timeout=30s,global.adapter_open_olt.timeout=30s,global.adapter_open_olt.rpc_timeout=30s
           onosStatInterval: 30
           onosGroupInterval: 30
+          onosReplicas: 1
+          atomixReplicas: 1
+          onosImg: andreacampanella/voltha-onos:extend-timeout
+          ofAgentImg: matteoscandolo/voltha-ofagent-go:scale-debug
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers-maclearner'