diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a49500263f5580a49632d12ad24befe7174bc47f..e7025b1897869ff8ea5b6831cff21051a44ebe32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -208,6 +208,7 @@ aws/network up:
       - unknown_failure
       - script_failure
       - stuck_or_timeout_failure
+      - runner_system_failure
 
 aws/network down:
   extends:
@@ -224,6 +225,7 @@ aws/network down:
       - unknown_failure
       - script_failure
       - stuck_or_timeout_failure
+      - runner_system_failure
 
 #-----------------------------------------------------------------------------------------------------------------------
 
@@ -250,6 +252,7 @@ aws/rke2/cluster up:
       - unknown_failure
       - script_failure
       - stuck_or_timeout_failure
+      - runner_system_failure
 
 # Install BigBang on RKE2 cluster on AWS
 aws/rke2/bigbang up:
@@ -271,6 +274,11 @@ aws/rke2/bigbang up:
     - *deploy_bigbang
   environment:
     name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+  retry:
+    max: 3
+    when:
+      - stuck_or_timeout_failure
+      - runner_system_failure
 
 # Run tests on BigBang on RKE2 cluster on AWS
 aws/rke2/bigbang test:
@@ -294,6 +302,11 @@ aws/rke2/bigbang test:
     - *test_bigbang
   environment:
     name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+  retry:
+    max: 3
+    when:
+      - stuck_or_timeout_failure
+      - runner_system_failure
 
 # Uninstall BigBang on RKE2 cluster on AWS
 aws/rke2/bigbang down:
@@ -335,6 +348,7 @@ aws/rke2/cluster down:
       - unknown_failure
       - script_failure
       - stuck_or_timeout_failure
+      - runner_system_failure
 
 #-----------------------------------------------------------------------------------------------------------------------