diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 6b9e854..6de1fcd 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -884,7 +884,7 @@
 
       - bool:
           name: withKind
-          default: false
+          default: '{with-kind}'
           description: "The pods uses kind and a physical fabric thus port forward to the management is needed"
 
     concurrent: true
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 7d62fd8..180a590 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -9,6 +9,7 @@
     build-timeout: '300'
 
     onos-version: '1.13.9'
+    with-kind: false
 
     jobs:
       # flex OCP pod with olt/onu - manual test job, voltha master build job
@@ -277,7 +278,7 @@
           released: true
           profile: 'Default'
           time: '9'
-          withKind: true
+          with-kind: true
 
       # Berlin POD test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':