diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 2953ee9..249cf3b 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -25,7 +25,7 @@
           withEapol: true
           withDhcp: true
           withIgmp: false
-          extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
+          extraHelmFlags: '--set authRetry=false,dhcpRetry=false'
           withPcap: false
 
       - 'voltha-scale-measurements':
@@ -63,13 +63,7 @@
           withDhcp: true
           withIgmp: false
           inMemoryEtcdStorage: false
-          extraHelmFlags: '--set authRetry=true,dhcpRetry=true -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn'
-          onosImg: andreacampanella/voltha-onos:voltha-onos-2.5
-          bbsimImg: gcgirish/bbsim:etcd
-          rwCoreImg: volthacore/voltha-rw-core:noflows
-          ofAgentImg: volthacore/voltha-ofagent:noflows
-          openoltAdapterImg: gcgirish/voltha-openolt-adapter:etcdNew
-          openonuAdapterGoImg: gcgirish/voltha-openonu-adapter-go:etcdNew
+          extraHelmFlags: '--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn'
           volthaHelmChartsChange: refs/changes/69/25069/7
 
       # jobs for 1024 ONUs with openonu-go and clustered ONOS (2 OLTs)
@@ -86,7 +80,7 @@
           withEapol: true
           withDhcp: true
           withIgmp: false
-          extraHelmFlags: '--set authRetry=true,dhcpRetry=true -f /home/jenkins/voltha-scale/voltha-values.yaml '
+          extraHelmFlags: '--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml '
           rwCoreImg: volthacore/voltha-rw-core:meter
 
       - 'voltha-scale-measurements':
@@ -122,7 +116,7 @@
           withIgmp: true
           onosReplicas: 3
           atomixReplicas: 3
-          extraHelmFlags: '--set dhcpRetry=true -f /home/jenkins/voltha-scale/voltha-values.yaml '
+          extraHelmFlags: '--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml '
           rwCoreImg: volthacore/voltha-rw-core:meter
 
       # multi-stack jobs