diff --git a/jjb/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index a6a56b4..7d1b139 100755
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -87,7 +87,7 @@
     }
   }
   stage('Test - '+ name) {
-    timeout(60) {
+    timeout(75) {
       sh """
         ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/${name}"
         mkdir -p \$ROBOT_LOGS_DIR
@@ -197,7 +197,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 120, unit: 'MINUTES')
+    timeout(time: 150, unit: 'MINUTES')
   }
   environment {
     PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 3086a3e..3d4790d 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -181,7 +181,7 @@
               flags: ""
               teardown: false
               logging: true
-          timeout: 180
+          timeout: 210
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multi-uni-test-bbsim-2.8'
@@ -314,6 +314,7 @@
               flags: ""
               teardown: true
               logging: true
+          timeout: 160
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-openonu-go-test-bbsim-2.8'
@@ -467,6 +468,7 @@
               flags: ""
               teardown: true
               logging: true
+          timeout: 160
 
       - 'voltha-periodic-test':
           name: 'patchset-voltha-2.8-openonu-go-test-bbsim'
@@ -606,7 +608,7 @@
               teardown: true
               logging: true
           time-trigger: "H H/12 * * *"
-          timeout: 160
+          timeout: 190
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.8'
@@ -733,7 +735,7 @@
               teardown: true
               logging: true
           olts: 2
-          timeout: 160
+          timeout: 190
 
       - 'voltha-periodic-test':
           name: 'patchset-voltha-2.8-multiple-olts-openonu-go-test-bbsim'