diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 03e7bc6..6ba9fb3 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -37,12 +37,14 @@ steps:
         allow_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.4.1:
+      - junit-annotate#v2.7.0:
           artifacts: "junit-*.xml"
           fail-build-on-error: true
-    agents:
-      provider: "gcp" #junit plugin requires docker
+          run-in-docker: false
     depends_on:
       - step: "prepare-report"
         allow_failure: true