diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56addbc202..84ae8f4b25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -363,6 +363,7 @@ stages:
   needs:
     - job: ci-variables
       artifacts: true
+  timeout: 2h
 
 .system_test_common: &system_test_common
   <<: *default_triggering_rules
diff --git a/util/ci-wait-shotgun.py b/util/ci-wait-shotgun.py
index ae126e615f..c7f5f26eab 100755
--- a/util/ci-wait-shotgun.py
+++ b/util/ci-wait-shotgun.py
@@ -53,7 +53,7 @@ def get_child_pipeline_id(project, pipeline_id):
         pipeline.refresh()
         return pipeline.finished_at is not None
 
-    wait_until(pipeline_finished, timeout=3000)
+    wait_until(pipeline_finished, timeout=6600)
 
     bridges = pipeline.bridges.list()
     if len(bridges) != 1: