diff --git a/jobs/templates/swh-pipeline-diff.yaml b/jobs/templates/swh-pipeline-diff.yaml
--- a/jobs/templates/swh-pipeline-diff.yaml
+++ b/jobs/templates/swh-pipeline-diff.yaml
@@ -11,6 +11,7 @@
     auth-token: 'ph4br1cat0r'
     phabricator_diff: true
     do_cypress: false
+    timeout: 30
     properties:
       - build-discarder:
           artifact-num-to-keep: 20
diff --git a/jobs/templates/swh-pipeline.groovy.j2 b/jobs/templates/swh-pipeline.groovy.j2
--- a/jobs/templates/swh-pipeline.groovy.j2
+++ b/jobs/templates/swh-pipeline.groovy.j2
@@ -1,3 +1,9 @@
+{%- if timeout %}
+def timeout = {{ timeout }}
+{%- else %}
+def timeout = 20
+{%- endif %}
+
 pipeline {
   {% filter indent(width=2) %}
     {%- include 'includes/agent-docker.groovy.j2' -%}
@@ -87,7 +93,7 @@
 
     stage('Tests') {
       options {
-        timeout(time: 20, unit: 'MINUTES')
+        timeout(time: timeout, unit: 'MINUTES')
       }
 
       parallel {
diff --git a/jobs/templates/swh-pipeline.yaml b/jobs/templates/swh-pipeline.yaml
--- a/jobs/templates/swh-pipeline.yaml
+++ b/jobs/templates/swh-pipeline.yaml
@@ -15,6 +15,7 @@
       - build-discarder:
           artifact-num-to-keep: 20
     phabricator_diff: false
+    timeout: 30
     do_cypress: false
     parameters:
       - git-parameter: