diff --git a/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml b/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml
index f1b48ddd5b..f1edb91667 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml
@@ -17,9 +17,8 @@
     concurrent: true
 
     wrappers:
-      - timeout:
+      - build-timeout:
           timeout: 30
-          fail: true
       - timestamps
 
     logrotate:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index d97f282532..441c2fdb05 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -295,6 +295,16 @@
 
 # ======================================================================
 
+- wrapper:
+    name: build-timeout
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true
+
+# ======================================================================
+
 - publisher:
     name: tarball
     publishers: