diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 085b216..a6313fd 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -87,14 +87,14 @@
           withEapol: true
           withDhcp: true
           withIgmp: false
-          extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn'
+          extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml --set voltha.global.rw_core.timeout=60s --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
-          volthaHelmChartsChange: refs/changes/69/25069/7
+          rwCoreImg: gcgirish/voltha-rw-core:etcdRetry
+          ofAgentImg: voltha/voltha-ofagent-go:master
+          openoltAdapterImg: gcgirish/voltha-openolt-adapter:etcdPool
+          openonuAdapterGoImg: gcgirish/voltha-openonu-adapter-go:etcdPool
+          volthaHelmChartsChange: refs/changes/69/25069/20
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'