diff --git a/.buildkite/rest-tests.yaml b/.buildkite/rest-tests.yaml
index 1691c01..631fa71 100644
--- a/.buildkite/rest-tests.yaml
+++ b/.buildkite/rest-tests.yaml
@@ -18,7 +18,7 @@ steps:
       EC_REGISTER_BACKEND: "appex-qa-team-cluster"
       EC_ENV: "qa"
       EC_REGION: "aws-eu-west-1"
-      EC_PROJECT_NAME: "esv-client-python-test-{{ matrix.python }}-{{ matrix.suite }}-{{ matrix.connection_class }}-{{ key }}"
+      EC_PROJECT_PREFIX: "esv-client-python-test-{{ matrix.python }}-{{ matrix.suite }}-{{ matrix.connection_class }}"
     matrix:
       setup:
         suite:
diff --git a/.buildkite/run-tests b/.buildkite/run-tests
index cdfb422..fa0b87e 100755
--- a/.buildkite/run-tests
+++ b/.buildkite/run-tests
@@ -4,6 +4,7 @@
 export TEST_SUITE="${TEST_SUITE:=platinum}"
 export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
 export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=urllib3}"
+export EC_PROJECT_NAME="$EC_PROJECT_PREFIX-$BUILDKITE_JOB_ID"
 
 set -euo pipefail
 
@@ -19,6 +20,7 @@ run_qaf() {
     -e EC_REGION \
     -e EC_PROJECT_NAME \
     -e VAULT_TOKEN \
+    -e BUILDKITE \
     -v "$(pwd)/cloud.json:/root/.elastic/cloud.json" \
     docker.elastic.co/employees/dolaru/qaf:latest \
     bash -c "$cmd"