diff --git a/jenkins/jobs/networking-bgpvpn.yaml b/jenkins/jobs/networking-bgpvpn.yaml
index 8744e28e89..e57dd937be 100644
--- a/jenkins/jobs/networking-bgpvpn.yaml
+++ b/jenkins/jobs/networking-bgpvpn.yaml
@@ -6,7 +6,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -18,7 +18,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           # For now, simply enable bringing stack.sh up with the BGPVPN service plugin.
           # Future jobs will run tempest.
@@ -54,7 +53,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -64,7 +63,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           # For now, simply enable bringing stack.sh up with the BGPVPN service plugin and the bagpipe driver.
           # Future jobs will run tempest.
@@ -96,4 +94,3 @@
     publishers:
       - devstack-logs
       - console-log
-
diff --git a/jenkins/jobs/networking-midonet.yaml b/jenkins/jobs/networking-midonet.yaml
index 0bb0c10142..34507a8450 100644
--- a/jenkins/jobs/networking-midonet.yaml
+++ b/jenkins/jobs/networking-midonet.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=1
           export BRANCH_OVERRIDE={branch-override}
@@ -59,7 +58,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -71,7 +70,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=1
           export BRANCH_OVERRIDE={branch-override}
@@ -111,7 +109,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -121,7 +119,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=1
           export BRANCH_OVERRIDE={branch-override}
@@ -160,7 +157,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -170,7 +167,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export RALLY_SCENARIO=networking-midonet
           export BRANCH_OVERRIDE={branch-override}
diff --git a/jenkins/jobs/networking-odl.yaml b/jenkins/jobs/networking-odl.yaml
index 05fa7011ae..6cc0828a77 100644
--- a/jenkins/jobs/networking-odl.yaml
+++ b/jenkins/jobs/networking-odl.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           # Make sure tempest is installed, but run it out of the post_test_hooks.sh
           # script from the networking-odl repository.
diff --git a/jenkins/jobs/networking-ofagent.yaml b/jenkins/jobs/networking-ofagent.yaml
index 5ad887fa72..878cdcb930 100644
--- a/jenkins/jobs/networking-ofagent.yaml
+++ b/jenkins/jobs/networking-ofagent.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
           export PROJECTS="openstack/networking-ofagent $PROJECTS"
           export KEEP_LOCALRC=1
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=1
 
diff --git a/jenkins/jobs/networking-onos.yaml b/jenkins/jobs/networking-onos.yaml
index a1f562b00e..46344eb192 100644
--- a/jenkins/jobs/networking-onos.yaml
+++ b/jenkins/jobs/networking-onos.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           # Make sure tempest is installed, but run it out of the post_test_hooks.sh
           # script from the networking-onos repository.
diff --git a/jenkins/jobs/networking-ovn.yaml b/jenkins/jobs/networking-ovn.yaml
index 9c28dac961..d209616745 100644
--- a/jenkins/jobs/networking-ovn.yaml
+++ b/jenkins/jobs/networking-ovn.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=1
           export BRANCH_OVERRIDE={branch-override}
@@ -64,7 +63,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -74,7 +73,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export RALLY_SCENARIO=ovn
           export BRANCH_OVERRIDE={branch-override}
@@ -107,4 +105,3 @@
       - devstack-logs
       - console-log
       - rally-plot
-
diff --git a/jenkins/jobs/neutron-fwaas.yaml b/jenkins/jobs/neutron-fwaas.yaml
index 79b6b2302b..4db7841d96 100644
--- a/jenkins/jobs/neutron-fwaas.yaml
+++ b/jenkins/jobs/neutron-fwaas.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -17,7 +17,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_UNSTACK=1
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_NEUTRON=1
@@ -51,7 +50,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -64,7 +63,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_UNSTACK=1
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_NEUTRON=1
diff --git a/jenkins/jobs/neutron-lbaas.yaml b/jenkins/jobs/neutron-lbaas.yaml
index c619b48582..f14c46370f 100644
--- a/jenkins/jobs/neutron-lbaas.yaml
+++ b/jenkins/jobs/neutron-lbaas.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export DEVSTACK_GATE_EXERCISES=0
diff --git a/jenkins/jobs/neutron-vpnaas.yaml b/jenkins/jobs/neutron-vpnaas.yaml
index 605350a45d..00140bbac1 100644
--- a/jenkins/jobs/neutron-vpnaas.yaml
+++ b/jenkins/jobs/neutron-vpnaas.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -17,7 +17,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_UNSTACK=1
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_NEUTRON=1
diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index 4c94f3650a..ed31beb8fe 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export DEVSTACK_GATE_EXERCISES=0
@@ -51,7 +50,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -63,7 +62,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
@@ -85,7 +83,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -95,7 +93,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
@@ -126,7 +123,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -139,7 +136,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_UNSTACK=1
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_NEUTRON=1
@@ -184,7 +180,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -197,7 +193,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_UNSTACK=1
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_NEUTRON=1
@@ -231,7 +226,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -243,7 +238,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export BRANCH_OVERRIDE={branch-override}
           export PROJECTS="openstack/python-neutronclient $PROJECTS"
@@ -277,7 +271,7 @@
 
     wrappers:
       - timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -289,7 +283,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_NEUTRON=1
@@ -311,7 +304,7 @@
 
     wrappers:
       - timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -323,7 +316,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_NEUTRON=1
@@ -345,7 +337,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -355,7 +347,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_NEUTRON=1
@@ -385,7 +376,7 @@
 
     wrappers:
       - timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -397,7 +388,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_NEUTRON=1
@@ -419,7 +409,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -431,7 +421,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_NEUTRON=1
diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml
index cc8ec92858..6598400996 100644
--- a/jenkins/jobs/nodepool.yaml
+++ b/jenkins/jobs/nodepool.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           # Disable tempest as nodepool is talking to the cloud not tempest.
           export DEVSTACK_GATE_TEMPEST=0
           # Use neutron as the public clouds in use are neutron based.
@@ -61,7 +60,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -71,7 +70,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           # Disable tempest as nodepool is talking to the cloud not tempest.
           export DEVSTACK_GATE_TEMPEST=0
           # Use neutron as the public clouds in use are neutron based.
diff --git a/jenkins/jobs/nova-docker.yaml b/jenkins/jobs/nova-docker.yaml
index b153424f1d..23ec428115 100644
--- a/jenkins/jobs/nova-docker.yaml
+++ b/jenkins/jobs/nova-docker.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -36,7 +36,6 @@
           export -f post_test_hook
 
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export PROJECTS="openstack/nova-docker $PROJECTS"
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
@@ -52,7 +51,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -83,7 +82,6 @@
 
           export -f post_test_hook
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export PROJECTS="openstack/nova-docker $PROJECTS"
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/jenkins/jobs/nova.yaml b/jenkins/jobs/nova.yaml
index 326c6c743a..e94809484b 100644
--- a/jenkins/jobs/nova.yaml
+++ b/jenkins/jobs/nova.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export BRANCH_OVERRIDE={branch-override}
           export PROJECTS="openstack/python-novaclient $PROJECTS"
           export DEVSTACK_PROJECT_FROM_GIT=python-novaclient
diff --git a/jenkins/jobs/osc.yaml b/jenkins/jobs/osc.yaml
index 656bb48d93..c81e0ecf50 100644
--- a/jenkins/jobs/osc.yaml
+++ b/jenkins/jobs/osc.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -15,7 +15,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_UNSTACK=0
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
diff --git a/jenkins/jobs/oslo.yaml b/jenkins/jobs/oslo.yaml
index fc1f493de1..727b8fd72b 100644
--- a/jenkins/jobs/oslo.yaml
+++ b/jenkins/jobs/oslo.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 95
+          timeout: 100
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=95
           export PROJECTS="{injectedrepo} $PROJECTS"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -52,7 +51,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 95
+          timeout: 100
       - timestamps
 
     builders:
@@ -64,7 +63,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=90
 
           function post_test_hook {{
               cd /opt/stack/new/oslo.messaging/oslo_messaging/tests/functional/gate
diff --git a/jenkins/jobs/python-barbicanclient.yaml b/jenkins/jobs/python-barbicanclient.yaml
index afeaf62c5e..2d0391291c 100644
--- a/jenkins/jobs/python-barbicanclient.yaml
+++ b/jenkins/jobs/python-barbicanclient.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export ENABLED_SERVICES=barbican,tempest,keystone
           export PROJECTS="openstack/barbican $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
@@ -44,7 +43,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -54,7 +53,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export ENABLED_SERVICES=barbican,tempest,keystone
           export PROJECTS="openstack/barbican $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml
index 2d7ae5044e..c2e7557638 100644
--- a/jenkins/jobs/rally.yaml
+++ b/jenkins/jobs/rally.yaml
@@ -57,7 +57,6 @@
           export DEVSTACK_GATE_ZAQAR={zaqar}
           export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops}
           export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_TIMEOUT=120
           export RALLY_SCENARIO={scenario}
           export DEVSTACK_GATE_USE_KEYSTONE_V2API={keystone_use_v2api}
 
@@ -124,7 +123,6 @@
           export DEVSTACK_GATE_NEUTRON={neutron}
           export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops}
           export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_TIMEOUT=120
           export RALLY_SCENARIO={scenario}
 
           export IDENTITY_API_VERSION=3
@@ -193,7 +191,6 @@
           export IDENTITY_API_VERSION=3
 
           export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_TIMEOUT=60
           export RALLY_SCENARIO={scenario}
 
           export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
@@ -227,7 +224,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -247,7 +244,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -276,7 +273,6 @@
           export DEVSTACK_GATE_NEUTRON={neutron}
           export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops}
           export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_TIMEOUT=120
           export RALLY_SCENARIO={scenario}
 
           export IDENTITY_API_VERSION=3
@@ -329,7 +325,6 @@
           export DEVSTACK_GATE_NEUTRON={neutron}
           export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops}
           export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_TIMEOUT=120
           export RALLY_SCENARIO={scenario}
 
           export IDENTITY_API_VERSION=3
@@ -353,7 +348,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -382,7 +377,6 @@
           export PROJECTS="openstack/rally $PROJECTS"
           export PROJECTS="openstack/cue openstack/python-cueclient openstack/cue-dashboard $PROJECTS"
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=100
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export RALLY_SCENARIO={scenario}
@@ -416,7 +410,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -437,7 +431,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -458,7 +452,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 110
       - timestamps
 
     builders:
@@ -478,7 +472,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -499,7 +493,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -523,7 +517,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -547,7 +541,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -571,7 +565,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -594,7 +588,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -617,7 +611,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -635,7 +629,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 60
+          timeout: 65
       - timestamps
 
     builders:
@@ -681,7 +675,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 120
+          timeout: 125
 
     builders:
       - devstack-rally-verify:
@@ -711,7 +705,6 @@
           export DEVSTACK_GATE_NEUTRON={neutron}
           export DEVSTACK_GATE_SAHARA={sahara}
           export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_TIMEOUT=120
           export RALLY_DO_COMPARE={compare}
 
           export IDENTITY_API_VERSION=3
@@ -796,7 +789,6 @@
 
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_TIMEOUT=120
           export RALLY_SCENARIO={scenario}
 
           export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api"
@@ -822,7 +814,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -840,7 +832,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 60
+          timeout: 65
       - timestamps
 
     builders:
diff --git a/jenkins/jobs/requirements.yaml b/jenkins/jobs/requirements.yaml
index 73cf085df1..1bcf5d78b0 100644
--- a/jenkins/jobs/requirements.yaml
+++ b/jenkins/jobs/requirements.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -108,7 +108,6 @@
           export PROJECTS="openstack/trove $PROJECTS"
           export PROJECTS="openstack/trove-dashboard $PROJECTS"
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_REQS_INTEGRATION=1
@@ -135,7 +134,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -239,7 +238,6 @@
           export PROJECTS="openstack/trove $PROJECTS"
           export PROJECTS="openstack/trove-dashboard $PROJECTS"
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_REQS_INTEGRATION=1
diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index c375366011..4e750d972c 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 95
+          timeout: 100
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=90
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
@@ -152,7 +151,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -162,7 +161,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
           export BRANCH_OVERRIDE={branch-override}
           export PROJECTS="openstack/python-saharaclient $PROJECTS"
@@ -190,7 +188,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -200,7 +198,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_REGEX="data_processing"
           if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then
@@ -245,7 +242,6 @@
               OVERRIDE_ENABLED_SERVICES+=,n-obj,
           fi
           export OVERRIDE_ENABLED_SERVICES
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_GRENADE=pullup
@@ -270,7 +266,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -280,7 +276,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
@@ -327,7 +322,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -337,7 +332,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
diff --git a/jenkins/jobs/scalpels.yaml b/jenkins/jobs/scalpels.yaml
index a9fd7c4b4b..c3c1a087ee 100644
--- a/jenkins/jobs/scalpels.yaml
+++ b/jenkins/jobs/scalpels.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_NEUTRON_DVR=1
           export BRANCH_OVERRIDE={branch-override}
diff --git a/jenkins/jobs/sdk.yaml b/jenkins/jobs/sdk.yaml
index 189b9853ed..78c603da77 100644
--- a/jenkins/jobs/sdk.yaml
+++ b/jenkins/jobs/sdk.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -15,7 +15,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_UNSTACK=0
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_HEAT=1
           export DEVSTACK_GATE_TEMPEST=0
diff --git a/jenkins/jobs/senlin.yaml b/jenkins/jobs/senlin.yaml
index 4bb5f305a6..d1af1f1427 100644
--- a/jenkins/jobs/senlin.yaml
+++ b/jenkins/jobs/senlin.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export BRANCH_OVERRIDE={branch-override}
           export PROJECTS="openstack/senlin $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
diff --git a/jenkins/jobs/shade.yaml b/jenkins/jobs/shade.yaml
index 77ea453183..b595371199 100644
--- a/jenkins/jobs/shade.yaml
+++ b/jenkins/jobs/shade.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -15,7 +15,6 @@
           #!/bin/bash -xe
           export SHADE_USE_KEYSTONE_V2=1
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export PROJECTS="openstack-infra/shade $PROJECTS"
           export BRANCH_OVERRIDE={branch-override}
@@ -40,7 +39,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -50,7 +49,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export PROJECTS="openstack-infra/shade $PROJECTS"
           export BRANCH_OVERRIDE={branch-override}
@@ -76,7 +74,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -86,7 +84,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=0
           export PROJECTS="openstack-infra/shade $PROJECTS"
           export BRANCH_OVERRIDE={branch-override}
@@ -112,7 +109,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -122,7 +119,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export PROJECTS="openstack-infra/shade $PROJECTS"
           export BRANCH_OVERRIDE={branch-override}
diff --git a/jenkins/jobs/solum.yaml b/jenkins/jobs/solum.yaml
index 6a75be9b9d..af427e602d 100644
--- a/jenkins/jobs/solum.yaml
+++ b/jenkins/jobs/solum.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral
           export DEVSTACK_LOCAL_CONFIG="enable_plugin solum git://git.openstack.org/openstack/solum"
@@ -56,7 +55,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -66,7 +65,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral
           export DEVSTACK_LOCAL_CONFIG="enable_plugin solum git://git.openstack.org/openstack/solum"
diff --git a/jenkins/jobs/sqlalchemy-migrate.yaml b/jenkins/jobs/sqlalchemy-migrate.yaml
index 8cae73b491..834119ec69 100644
--- a/jenkins/jobs/sqlalchemy-migrate.yaml
+++ b/jenkins/jobs/sqlalchemy-migrate.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 185
+          timeout: 190
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=180
           export PROJECTS="openstack/sqlalchemy-migrate $PROJECTS"
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
diff --git a/jenkins/jobs/swift.yaml b/jenkins/jobs/swift.yaml
index fe129000ca..6cb597ceb5 100644
--- a/jenkins/jobs/swift.yaml
+++ b/jenkins/jobs/swift.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 95
+          timeout: 100
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=90
           export FUNCTEST_TIMEOUT=30
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
@@ -45,7 +44,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 95
+          timeout: 100
       - timestamps
 
     builders:
@@ -55,7 +54,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=90
           export FUNCTEST_TIMEOUT=30
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
diff --git a/jenkins/jobs/tacker.yaml b/jenkins/jobs/tacker.yaml
index 05056d5a55..d40601c13f 100644
--- a/jenkins/jobs/tacker.yaml
+++ b/jenkins/jobs/tacker.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=0
           export BRANCH_OVERRIDE={branch-override}
diff --git a/jenkins/jobs/tap-as-a-service.yaml b/jenkins/jobs/tap-as-a-service.yaml
index c8029b50cf..4201fb3a8f 100644
--- a/jenkins/jobs/tap-as-a-service.yaml
+++ b/jenkins/jobs/tap-as-a-service.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
diff --git a/jenkins/jobs/tripleo.yaml b/jenkins/jobs/tripleo.yaml
index 3fe091696e..aa0be30e84 100644
--- a/jenkins/jobs/tripleo.yaml
+++ b/jenkins/jobs/tripleo.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 175
+          timeout: 180
       - timestamps
 
     builders:
@@ -25,7 +25,6 @@
           fi
 
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=170
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
 
@@ -66,4 +65,3 @@
     publishers:
       - devstack-logs
       - console-log
-
diff --git a/jenkins/jobs/trove.yaml b/jenkins/jobs/trove.yaml
index 5c86c166b9..811ceb84e5 100644
--- a/jenkins/jobs/trove.yaml
+++ b/jenkins/jobs/trove.yaml
@@ -33,7 +33,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 145
+          timeout: 150
       - timestamps
 
     builders:
@@ -43,7 +43,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=140
           export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
           export PROJECTS="openstack/python-troveclient $PROJECTS"
           export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
@@ -76,7 +75,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -86,7 +85,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
diff --git a/jenkins/jobs/watcher.yaml b/jenkins/jobs/watcher.yaml
index 9e0723271b..3dc1450576 100644
--- a/jenkins/jobs/watcher.yaml
+++ b/jenkins/jobs/watcher.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -29,7 +29,6 @@
           export ENABLED_SERVICES
           export DEVSTACK_LOCAL_CONFIG
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export DEVSTACK_GATE_TEMPEST_REGEX="watcher_tempest_plugin"
diff --git a/jenkins/jobs/zaqar.yaml b/jenkins/jobs/zaqar.yaml
index 5bf69a7157..d588ea16aa 100644
--- a/jenkins/jobs/zaqar.yaml
+++ b/jenkins/jobs/zaqar.yaml
@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 95
+          timeout: 100
       - timestamps
 
     builders:
@@ -18,7 +18,6 @@
           export FUNCTEST_TIMEOUT=30
           export DEVSTACK_GATE_ZAQAR=1
           export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_TIMEOUT=90
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
           export ENABLED_SERVICES=mysql,key,tempest
@@ -52,7 +51,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -63,7 +62,6 @@
           #!/bin/bash -xe
           export PROJECTS="openstack/python-zaqarclient $PROJECTS"
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export BRANCH_OVERRIDE={branch-override}
           export DEVSTACK_LOCAL_CONFIG="enable_plugin zaqar git://git.openstack.org/openstack/zaqar"