diff --git a/Jenkinsfile b/Jenkinsfile
index f1d7f1e289..37621dde5c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,7 +51,8 @@ pipeline {
     MAPBOX_TOKEN = credentials('mapbox_token')
   }
   options {
-    timeout(time: 4, unit: 'HOURS')
+    timeout(time: 3, unit: 'HOURS')
+    disableConcurrentBuilds(abortPrevious: env.BRANCH_NAME != 'master')
   }
 
   stages {