diff --git a/.buildkite/code.pipeline.yml b/.buildkite/code.pipeline.yml
index e6a8f0deb25..ff747954e5b 100644
--- a/.buildkite/code.pipeline.yml
+++ b/.buildkite/code.pipeline.yml
@@ -64,6 +64,8 @@ retry: &retry_agent_failure
   automatic:
     - exit_status: -1  # Agent was lost
       limit: 2
+    - exit_status: 125 # ERRO[0092] error waiting for container: unexpected EOF
+      limit: 2
     - exit_status: 255 # Forced agent shutdown
       limit: 2
 
diff --git a/.changelog/2900.internal.md b/.changelog/2900.internal.md
new file mode 100644
index 00000000000..a57fc1e2409
--- /dev/null
+++ b/.changelog/2900.internal.md
@@ -0,0 +1 @@
+ci: automatically rety exit status 125 failures