diff --git a/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
index fd27e86..1c6f9b7 100644
--- a/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
@@ -29,7 +29,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 640, unit: 'MINUTES')
+    timeout(time: ${params.timeout}, unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/pipeline/voltha/master/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha/master/voltha-physical-functional-tests.groovy
index 21feddd..f0c65e0 100644
--- a/jjb/pipeline/voltha/master/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-physical-functional-tests.groovy
@@ -29,7 +29,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 380, unit: 'MINUTES')
+    timeout(time: ${params.timeout}, unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy b/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy
index a87e300..26655a4 100644
--- a/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy
@@ -31,7 +31,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 280, unit: 'MINUTES')
+    timeout(time: ${params.timeout}, unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/pipeline/voltha/master/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha/master/voltha-tt-physical-functional-tests.groovy
index d738ba3..4b359a8 100644
--- a/jjb/pipeline/voltha/master/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-tt-physical-functional-tests.groovy
@@ -29,7 +29,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 210, unit: 'MINUTES')
+    timeout(time: ${params.timeout}, unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy
index 8ecbc33..29721be 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy
@@ -29,7 +29,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 640, unit: 'MINUTES')
+    timeout(time: ${params.timeout}, unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-physical-functional-tests.groovy
index 21feddd..f0c65e0 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-physical-functional-tests.groovy
@@ -29,7 +29,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 380, unit: 'MINUTES')
+    timeout(time: ${params.timeout}, unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy
index a87e300..26655a4 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy
@@ -31,7 +31,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 280, unit: 'MINUTES')
+    timeout(time: ${params.timeout}, unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-tt-physical-functional-tests.groovy
index 7ed2c37..0ed0b0c 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-tt-physical-functional-tests.groovy
@@ -29,7 +29,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 210, unit: 'MINUTES')
+    timeout(time: ${params.timeout}, unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/voltha-test/voltha-certification.yaml b/jjb/voltha-test/voltha-certification.yaml
index 75acaa6..90b6d25 100644
--- a/jjb/voltha-test/voltha-certification.yaml
+++ b/jjb/voltha-test/voltha-certification.yaml
@@ -89,6 +89,7 @@
 
       # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
+          timeout: 270
           build-node: 'menlo-certification-pod'
           config-pod: 'menlo-certification-pod-radisys-3200g'
           disable-job: false
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index a6bc3f5..797016b 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -304,9 +304,15 @@
 
     oltAdapterAppLabel: 'adapter-open-olt'
     enableMultiUni: false
+    timeout: 240
 
     parameters:
       - string:
+          name: timeout
+          default: '{timeout}'
+          description: 'Job pipeline timeout value'
+
+      - string:
           name: buildNode
           default: '{build-node}'
           description: 'Name of the Jenkins executor node to run the job on'
@@ -430,9 +436,15 @@
     manifest-branch: 'master'
 
     oltAdapterAppLabel: 'adapter-open-olt'
+    timeout: 240
 
     parameters:
       - string:
+          name: timeout
+          default: '{timeout}'
+          description: 'Job pipeline timeout value'
+
+      - string:
           name: buildNode
           default: '{build-node}'
           description: 'Name of the Jenkins executor node to run the job on'
@@ -555,9 +567,15 @@
 
     oltAdapterAppLabel: 'adapter-open-olt'
     enableMultiUni: false
+    timeout: 240
 
     parameters:
       - string:
+          name: timeout
+          default: '{timeout}'
+          description: 'Job pipeline timeout value'
+
+      - string:
           name: buildNode
           default: '{build-node}'
           description: 'Name of the Jenkins executor node to run the job on'
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 5de874a..04253bf 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -195,6 +195,7 @@
 
       # Menlo pod test job - master test job uses tech profile on voltha branch
       - 'build_voltha_pod_test':
+          timeout: 300
           build-node: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'
           release: 'master'
@@ -219,6 +220,7 @@
 
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
+          timeout: 300
           build-node: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'
           release: 'master'
@@ -248,6 +250,7 @@
 
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
+          timeout: 300
           build-node: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'
           release: '2.8'
@@ -397,6 +400,7 @@
 
       # Berlin POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
+          timeout: 300
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-multi-olt'
           release: 'master'
@@ -508,6 +512,7 @@
 
       # Berlin POD adtran test job - 2.8 versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
+          timeout: 390
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon-adtran'
           release: '2.8'