diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index c2d0cd7..366d4e6 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -623,7 +623,7 @@
       - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod'
-          'disable-pod': true
+          'disable-job': true
           release: '2.4'
           branch: 'voltha-2.4'
           num-of-openonu: '2'
@@ -641,7 +641,7 @@
       - 'build_voltha_pod_test':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod'
-          'disable-pod': true
+          'disable-job': true
           release: '2.4'
           branch: 'voltha-2.4'
           test-repo: 'voltha-system-tests'
@@ -716,7 +716,7 @@
       - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon'
-          'disable-pod': true
+          'disable-job': true
           release: '2.4'
           branch: 'voltha-2.4'
           num-of-openonu: '2'
@@ -736,7 +736,7 @@
       - 'build_voltha_pod_test':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon'
-          'disable-pod': true
+          'disable-job': true
           name-extension: '_DT'
           work-flow: 'DT'
           release: '2.4'
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 32b5190..999ddc5 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -156,6 +156,7 @@
 - job-template:
     name: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}'
     id: build_voltha_pod_release_dependent
+    disabled: '{disable-job}'
     description: |
                   Automatic Build on POD {config-pod}, using {Jenkinsfile} in {gerrit-server-url}/voltha-system-tests' <br /><br />
                   Created from job-template {id} from ci-management/jjb/voltha-test/voltha-nightly-jobs.yaml <br />
@@ -187,6 +188,7 @@
 - job-template:
     name: 'build_{config-pod}_{profile}_voltha{name-extension}_{release}_test'
     id: build_voltha_pod_test
+    disabled: '{disable-job}'
     description: |
                   Post Tests on {config-pod} triggered by build_{config-pod}_{branch}, using {pipeline-script}<br /><br />
                   Created from job-template {id} from ci-management/jjb/voltha-test/voltha-nightly-jobs.yaml <br />