diff --git a/.buildkite/pipeline.serverless.yml b/.buildkite/pipeline.serverless.yml
index 9b7fdf5a9..39f945036 100644
--- a/.buildkite/pipeline.serverless.yml
+++ b/.buildkite/pipeline.serverless.yml
@@ -69,13 +69,15 @@ steps:
     continue_on_failure: true
 
   - label: ":junit: Junit annotate"
+    agents:
+      # requires at least "bash", "curl" and "git"
+      image: "docker.elastic.co/ci-agent-images/buildkite-junit-annotate:1.0"
     plugins:
-      - junit-annotate#v2.5.0:
+      - junit-annotate#v2.7.0:
           artifacts: "build/test-results/*.xml"
           report-skipped: true
           always-annotate: true
-    agents:
-      provider: "gcp"  # junit plugin requires docker
+          run-in-docker: false
 
 notify:
   - email: "$NOTIFY_TO"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 96f1dd442..83aedb4fb 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -107,13 +107,15 @@ steps:
     continue_on_failure: true
 
   - label: ":junit: Junit annotate"
+    agents:
+      # requires at least "bash", "curl" and "git"
+      image: "docker.elastic.co/ci-agent-images/buildkite-junit-annotate:1.0"
     plugins:
-      - junit-annotate#v2.5.0:
+      - junit-annotate#v2.7.0:
           artifacts: "build/test-results/*.xml"
           report-skipped: true
           always-annotate: true
-    agents:
-      provider: "gcp"  # junit plugin requires docker
+          run-in-docker: false
 
   - label: ":github: Release"
     key: "release"