diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index d2fdd6b..2222803 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -406,11 +406,11 @@
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 volt-programmed-meters > $WORKSPACE/logs/onos-programmed-meters.txt
         fi
 
-        if [ ${withOnosApps} = true ] && [ ${withEapol} ] ; then
+        if [ ${withOnosApps} = true ] && [ ${withEapol} = true ] ; then
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 aaa-users > $WORKSPACE/logs/onos-aaa-users.txt
         fi
 
-        if [ ${withOnosApps} = true ] && [ ${withDhcp} ] ; then
+        if [ ${withOnosApps} = true ] && [ ${withDhcp} = true ] ; then
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 dhcpl2relay-allocations > $WORKSPACE/logs/onos-dhcp-allocations.txt
         fi
       '''
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 636717b..a02386c 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -126,7 +126,6 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set auth=false --set memoryLimit=8192Mi '
-          onosImg: andreacampanella/voltha-onos:meter-queue-final-3
 
 
       - 'voltha-scale-measurements':
@@ -144,8 +143,7 @@
           openonuAdapterReplicas: 8
           onosReplicas: 3
           atomixReplicas: 3
-          extraHelmFlags: '--set memoryLimit=8192Mi '
-          onosImg: andreacampanella/voltha-onos:meter-queue-final-3
+          extraHelmFlags: '--set memoryLimit=8192Mi --set defaults.rw_core.timeout=30s'
 
 
       # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
@@ -166,7 +164,6 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set memoryLimit=8192Mi '
-          onosImg: andreacampanella/voltha-onos:meter-queue-final-3
 
 
       # jobs for 1024 ONUs with a 8 openonu-adapters and clustered ONOS (2 OLTs)
@@ -187,7 +184,6 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set memoryLimit=8192Mi '
-          onosImg: andreacampanella/voltha-onos:meter-queue-final-3
 
       - 'voltha-scale-measurements':
           disabled: true
@@ -206,7 +202,6 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set memoryLimit=8192Mi --set auth=false '
-          onosImg: andreacampanella/voltha-onos:meter-queue-final-3
 
       - 'voltha-scale-measurements':
           disabled: true
@@ -224,8 +219,7 @@
           openonuAdapterReplicas: 8
           onosReplicas: 3
           atomixReplicas: 3
-          extraHelmFlags: '--set memoryLimit=8192Mi '
-          onosImg: andreacampanella/voltha-onos:meter-queue-final-3
+          extraHelmFlags: '--set memoryLimit=8192Mi --set defaults.rw_core.timeout=30s'
 
       # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
       - 'voltha-scale-measurements':
@@ -244,8 +238,7 @@
           openonuAdapterReplicas: 8
           onosReplicas: 3
           atomixReplicas: 3
-          extraHelmFlags: '--set memoryLimit=8192Mi '
-          onosImg: andreacampanella/voltha-onos:meter-queue-final-3
+          extraHelmFlags: '--set memoryLimit=8192Mi --set defaults.rw_core.timeout=30s'
 
       # development pipeline
       - 'voltha-scale-measurements-dev':