diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index a3f73d2..95a5b09 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -312,6 +312,11 @@
 
             export BBSIM=$(kubectl get pods -l app=bbsim -o name)
             _TAG=bbsim-tcpdump kubectl exec $BBSIM -- tcpdump -nei nni -w out.pcap&
+
+            export RADIUS=$(kubectl get pods -l app=radius -o name)
+            kubectl exec $RADIUS -- apt-get update
+            kubectl exec $RADIUS -- apt-get install -y tcpdump
+            _TAG=radius-tcpdump kubectl exec $RADIUS -- tcpdump -w out.pcap&
           fi
         '''
       }
@@ -438,6 +443,9 @@
 
           export BBSIM=$(kubectl get pods -l app=bbsim | awk 'NR==2{print $1}') || true
           kubectl cp $BBSIM:out.pcap $LOG_FOLDER/bbsim.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
         fi
 
         cd voltha-system-tests
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 76e8116..d84435b 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -67,7 +67,8 @@
           atomixReplicas: 3
           extraHelmFlags: '--set debug=true'
           withPcap: true
-          onosImg:  matteoscandolo/voltha-onos:timeout-release-identifier-single
+          onosImg:  andreacampanella/voltha-onos:aaa-identifier-cleanup
+          openoltAdapterImg:  andreacampanella/voltha-openolt-adapter:meter-fix
           radiusChart: /home/cord/helm-charts/freeradius