diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
index f3ff1c3552..d3aed9a4ba 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
@@ -7,6 +7,10 @@
       - gerrit-git-prep
 
     wrappers:
+      - timeout:
+          timeout: 30
+          fail: true
+      - timestamps
       - inject:
           script-file: /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
@@ -32,6 +36,10 @@
       - gerrit-git-prep
 
     wrappers:
+      - timeout:
+          timeout: 30
+          fail: true
+      - timestamps
       - inject:
           script-file: /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject: