diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit
deleted file mode 100755
index 86b277862c..0000000000
--- a/.buildkite/hooks/pre-exit
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-##  This script cleans up the workspace
-
-set -eo pipefail
-
-if [ "$BUILDKITE_PIPELINE_SLUG" == "apm-agent-java-opentelemetry-benchmark" ]; then
-    git reset --hard HEAD
-fi
diff --git a/.buildkite/opentelemetry-benchmark.yml b/.buildkite/opentelemetry-benchmark.yml
index 9deb6395bc..20d5ae2d70 100644
--- a/.buildkite/opentelemetry-benchmark.yml
+++ b/.buildkite/opentelemetry-benchmark.yml
@@ -7,6 +7,8 @@ steps:
       - "**/build/reports/tests/test/classes/io.opentelemetry.OverheadTests.html"
       - "**/build/reports/tests/test/index.html"
       - "output.json"
+    env: ## https://buildkite.com/docs/agent/v3/securing#forcing-clean-checkouts
+      BUILDKITE_CLEAN_CHECKOUT: true
 
 notify:
   - slack: "#apm-agent-java"
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 4fb2838cb0..6730746268 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -84,6 +84,8 @@ spec:
     spec:
       repository: elastic/apm-agent-java
       pipeline_file: ".buildkite/load-testing.yml"
+      provider_settings:
+        trigger_mode: none
       teams:
         apm-agent-java:
           access_level: MANAGE_BUILD_AND_READ
@@ -116,7 +118,7 @@ spec:
       pipeline_file: ".buildkite/opentelemetry-benchmark.yml"
       default_branch: main
       provider_settings:
-        publish_commit_status: false
+        trigger_mode: none
       teams:
         apm-agent-java:
           access_level: MANAGE_BUILD_AND_READ