diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcea197e8a2ff9987da56f162b64e15b731eb1eb..04810e6c5c9402d9c0fa078a67d810529e25943b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -233,6 +233,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 variables:
   ci_image_name: ${GCP_REGISTRY}/${CI_PROJECT_PATH}/ci
diff --git a/.gitlab/ci/pipelines/base_images.yml b/.gitlab/ci/pipelines/base_images.yml
index 8109d231bd6d4273a1a5517b6f6dc648ba9d9727..2d85cd6277723241e30a317b2f8cfb74d60d8abf 100644
--- a/.gitlab/ci/pipelines/base_images.yml
+++ b/.gitlab/ci/pipelines/base_images.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml
index 451864873ce3c2c1745bda3d87eca6f8f2cae1f0..b545773148a301bd89432f87b71699636ef3cfae 100644
--- a/.gitlab/ci/pipelines/debian_repository_partial.yml
+++ b/.gitlab/ci/pipelines/debian_repository_partial.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml
index 451864873ce3c2c1745bda3d87eca6f8f2cae1f0..b545773148a301bd89432f87b71699636ef3cfae 100644
--- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml
+++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/homebrew.yml b/.gitlab/ci/pipelines/homebrew.yml
index a5d4a7c0eccda529196c07eed841ae7aafb1b8ff..a6b1c4da271fd9393edc9cb6e4414529875e7350 100644
--- a/.gitlab/ci/pipelines/homebrew.yml
+++ b/.gitlab/ci/pipelines/homebrew.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/homebrew_auto.yml b/.gitlab/ci/pipelines/homebrew_auto.yml
index a5d4a7c0eccda529196c07eed841ae7aafb1b8ff..a6b1c4da271fd9393edc9cb6e4414529875e7350 100644
--- a/.gitlab/ci/pipelines/homebrew_auto.yml
+++ b/.gitlab/ci/pipelines/homebrew_auto.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/octez_monitoring.yml b/.gitlab/ci/pipelines/octez_monitoring.yml
index 59ce852a409c1e46f0fb2306e9a4640d85a9a26a..cbe80fd2b7a320bad91df00facd00a2285fcbc98 100644
--- a/.gitlab/ci/pipelines/octez_monitoring.yml
+++ b/.gitlab/ci/pipelines/octez_monitoring.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/rpm_repository_partial.yml b/.gitlab/ci/pipelines/rpm_repository_partial.yml
index 8c1d755ac508f78dde4bb9f49e70d08559915107..a5594970293df94ae67d257866f23ae6920e5cb2 100644
--- a/.gitlab/ci/pipelines/rpm_repository_partial.yml
+++ b/.gitlab/ci/pipelines/rpm_repository_partial.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml
index 8c1d755ac508f78dde4bb9f49e70d08559915107..a5594970293df94ae67d257866f23ae6920e5cb2 100644
--- a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml
+++ b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/.gitlab/ci/pipelines/security-scans-master.yml b/.gitlab/ci/pipelines/security-scans-master.yml
index 8db6621bc066f8278c85f7def72fb7733ab3531c..459606f5154c437ff3a5b1e598b4664cc14cb027 100644
--- a/.gitlab/ci/pipelines/security-scans-master.yml
+++ b/.gitlab/ci/pipelines/security-scans-master.yml
@@ -8,6 +8,9 @@ default:
     when:
     - stuck_or_timeout_failure
     - runner_system_failure
+    - api_failure
+    - unknown_failure
+    - scheduler_failure
 
 workflow:
   rules:
diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml
index b6350439da5042ad11bf664eb6bef687d33d8c59..4c3a2a003d159b66559d48706ff39116e2a7943f 100644
--- a/ci/lib_tezos_ci/tezos_ci.ml
+++ b/ci/lib_tezos_ci/tezos_ci.ml
@@ -199,9 +199,20 @@ module Pipeline = struct
       {
         image = None;
         interruptible = Some true;
+        (* Check https://docs.gitlab.com/ci/yaml/#retry for more details *)
         retry =
           Some
-            {max = 2; when_ = [Stuck_or_timeout_failure; Runner_system_failure]};
+            {
+              max = 2;
+              when_ =
+                [
+                  Stuck_or_timeout_failure;
+                  Runner_system_failure;
+                  Api_failure;
+                  Unknown_failure;
+                  Scheduler_failure;
+                ];
+            };
       }
 
   let default = function