diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8220bcd..a4adac0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -22,11 +22,12 @@ steps:
   - key: junit
     label: ":junit: Test results"
     agents:
-      provider: "gcp"
-      image: family/core-ubuntu-2204
+      # requires at least "bash", "curl" and "git"
+      image: "docker.elastic.co/ci-agent-images/buildkite-junit-annotate:1.0"
     plugins:
-      - junit-annotate#v2.4.1:
+      - junit-annotate#v2.7.0:
           artifacts: "junit-output/junit-*.xml"
           job-uuid-file-pattern: "junit-(.*).xml"
           fail-build-on-error: true
           failure-format: file
+          run-in-docker: false