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 1c6f9b7..a551fa4 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: ${params.timeout}, unit: 'MINUTES')
+    timeout(time: "${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 f0c65e0..aca802b 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: ${params.timeout}, unit: 'MINUTES')
+    timeout(time: "${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 26655a4..a9a2005 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: ${params.timeout}, unit: 'MINUTES')
+    timeout(time: "${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 4b359a8..cc3538a 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: ${params.timeout}, unit: 'MINUTES')
+    timeout(time: "${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 29721be..05e0902 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: ${params.timeout}, unit: 'MINUTES')
+    timeout(time: "${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 f0c65e0..aca802b 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: ${params.timeout}, unit: 'MINUTES')
+    timeout(time: "${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 26655a4..a9a2005 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: ${params.timeout}, unit: 'MINUTES')
+    timeout(time: "${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 0ed0b0c..c6cd0d2 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: ${params.timeout}, unit: 'MINUTES')
+    timeout(time: "${timeout}", unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 797016b..bc70d30 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -310,7 +310,7 @@
       - string:
           name: timeout
           default: '{timeout}'
-          description: 'Job pipeline timeout value'
+          description: 'Job pipeline timeout value [minutes]'
 
       - string:
           name: buildNode
@@ -442,7 +442,7 @@
       - string:
           name: timeout
           default: '{timeout}'
-          description: 'Job pipeline timeout value'
+          description: 'Job pipeline timeout value [minutes]'
 
       - string:
           name: buildNode
@@ -573,7 +573,7 @@
       - string:
           name: timeout
           default: '{timeout}'
-          description: 'Job pipeline timeout value'
+          description: 'Job pipeline timeout value [minutes]'
 
       - string:
           name: buildNode