diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 8f1839c..d1839dd 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -13,7 +13,6 @@
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-experimental'
           build-node: 'voltha-scale-1'
-          disable-job: false
           # trigger on Feb 29th (a.k.a only trigger it manually)
           time-trigger: "H 0 29 2 *"
           withMonitoring: true
@@ -31,7 +30,6 @@
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-experimental-multi-stack'
           build-node: 'voltha-scale-2'
-          disable-job: false
           pipeline-script: 'voltha/master/voltha-scale-multi-stack.groovy'
           # trigger on Feb 29th (a.k.a only trigger it manually)
           time-trigger: "H 0 29 2 *"
@@ -63,11 +61,14 @@
           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'
+          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
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-onu-upgrade-2-16-32-att-onus'
-          disable-job: false
           build-node: 'voltha-scale-1'
           time-trigger: "H H/12 * * *"
           olts: 2
@@ -847,7 +848,7 @@
     dockerRegistry: 10.90.0.101:30500
     trigger-comment: vv7CBoQQYYonvaN8xcru
     time-trigger: 0 0 29 2 *
-    disable-job: false
+    disable-job: true
 
     <<: *voltha-scale-job-parameters