diff --git a/.buildkite/test-template.j2 b/.buildkite/test-template.j2
index ea02b6b1e9c9e..919a09e1cc064 100644
--- a/.buildkite/test-template.j2
+++ b/.buildkite/test-template.j2
@@ -14,6 +14,8 @@ steps:
       automatic:
         - exit_status: -1  # Agent was lost
           limit: 5
+        - exit_status: -10  # Agent was lost
+          limit: 5
   - wait
 
   - group: "AMD Tests"
@@ -53,6 +55,8 @@ steps:
       automatic:
         - exit_status: -1  # Agent was lost
           limit: 5
+        - exit_status: -10  # Agent was lost
+          limit: 5
     plugins:
       - kubernetes:
           podSpec: