diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1fdc76b1fd..117dc6fd41 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -56,6 +56,8 @@ steps:
         key: run-serverless-tests
         depends_on:
           - step: create-serverless
+        soft_fail:
+          - exit_status: "*"
         agents:
           provider: gcp
         env:
diff --git a/elasticsearch-api/spec/yaml-test-runner/run.rb b/elasticsearch-api/spec/yaml-test-runner/run.rb
index 8bccc1779f..79bdea8cf3 100644
--- a/elasticsearch-api/spec/yaml-test-runner/run.rb
+++ b/elasticsearch-api/spec/yaml-test-runner/run.rb
@@ -64,8 +64,8 @@ def serverless?
     {
       retry_on_status: [409, 400, 503],
       retry_on_failure: 30,
-      delay_on_retry: 10_000,
-      request_timeout: 120
+      delay_on_retry: 5_000,
+      request_timeout: 60
     }
   )
 end