diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 92c5e78..3e317d8 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -13,6 +13,7 @@
       - '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
@@ -30,6 +31,7 @@
       - '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 *"
@@ -52,6 +54,7 @@
           name: 'voltha-scale-measurements-master-2-16-32-att-subscribers'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           olts: 2
           pons: 16
           onus: 32
@@ -66,6 +69,7 @@
           name: 'voltha-scale-measurements-master-onu-upgrade-2-16-32-att-onus'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/12 * * *"
+          disable-job: true
           olts: 2
           pons: 16
           onus: 32
@@ -81,6 +85,7 @@
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           olts: 2
           pons: 16
           onus: 32
@@ -96,6 +101,7 @@
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           olts: 2
           pons: 16
           onus: 32
@@ -117,6 +123,7 @@
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers-maclearner'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           olts: 2
           pons: 16
           onus: 32
@@ -141,6 +148,7 @@
           name: 'voltha-scale-measurements-master-2-64-32-dt-subscribers'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           olts: 2
           pons: 64
           onus: 32
@@ -160,6 +168,7 @@
             name: 'voltha-scale-measurements-master-1-64-63-dt-subscribers'
             build-node: 'voltha-scale-1'
             time-trigger: "H H/4 * * *"
+            disable-job: true
             olts: 1
             pons: 64
             onus: 63
@@ -179,6 +188,7 @@
             name: 'voltha-scale-measurements-master-1-64-63-tt-subscribers'
             build-node: 'voltha-scale-1'
             time-trigger: "H H/4 * * *"
+            disable-job: true
             olts: 1
             pons: 64
             onus: 63
@@ -200,6 +210,7 @@
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha/master/voltha-scale-multi-stack.groovy'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           logLevel: WARN
           onosReplicas: 1
           atomixReplicas: 0
@@ -222,6 +233,7 @@
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha/master/voltha-scale-multi-stack.groovy'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           logLevel: WARN
           onosReplicas: 1
           atomixReplicas: 0
@@ -244,6 +256,7 @@
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha/master/voltha-scale-multi-stack.groovy'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           logLevel: WARN
           onosReplicas: 1
           atomixReplicas: 0
@@ -267,6 +280,7 @@
           pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           olts: 2
           pons: 16
           onus: 32
@@ -291,6 +305,7 @@
           pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           olts: 2
           pons: 16
           onus: 32
@@ -316,6 +331,7 @@
           pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           olts: 2
           pons: 16
           onus: 32
@@ -342,6 +358,7 @@
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           withMonitoring: false
           logLevel: WARN
           onosReplicas: 1
@@ -374,6 +391,7 @@
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           withMonitoring: false
           logLevel: WARN
           onosReplicas: 1
@@ -406,6 +424,7 @@
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
           time-trigger: "H H/4 * * *"
+          disable-job: true
           withMonitoring: false
           logLevel: WARN
           onosReplicas: 1
@@ -487,9 +506,9 @@
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-lwc'
           pipeline-script: 'voltha/master/voltha-scale-lwc-test.groovy'
-          build-node: 'voltha-scale-1'
-          # trigger on Feb 29th (a.k.a only trigger it manually)
-          time-trigger: "H 0 29 2 *"
+          build-node: 'berlin-community-pod-2'
+          time-trigger: "H H * * *"
+          disable-job: false
           withMonitoring: true
           olts: 1
           pons: 16
@@ -747,8 +766,7 @@
 - job-template:
     id: 'voltha-scale-measurements'
     name: '{name}'
-    # disabled: '{disable-job}'
-    disabled: true
+    disabled: '{disable-job}'
 
     description: |
       <!-- Managed by Jenkins Job Builder -->