diff --git a/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh b/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh
index 4c831b9539288..3a5948c6f5bcb 100644
--- a/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh
+++ b/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh
@@ -64,7 +64,7 @@ git clone --depth 1 "https://github.com/openshift-hyperfleet/hyperfleet-infra.gi
 cd /tmp/hyperfleet-infra
 
 HELMFILE_ENV="e2e-gcp"
-NAMESPACE=${NAMESPACE_NAME} HELMFILE_ENV="${HELMFILE_ENV}" make install-hyperfleet
+NAMESPACE=${NAMESPACE_NAME} RUN_ID=${NAMESPACE_NAME} HELMFILE_ENV="${HELMFILE_ENV}" make install-hyperfleet
 
 # Save installed charts for cleanup
 HELMFILE_JSON="${SHARED_DIR}/helm-release-${NAMESPACE_NAME}.json"
diff --git a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh
index 77897aed549b8..aa467ca68c0d4 100644
--- a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh
+++ b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh
@@ -52,10 +52,6 @@ export NAMESPACE
 GCP_PROJECT_ID=$(cat "${SHARED_DIR}/gcp_project_id")
 export GCP_PROJECT_ID
 
-# Extract run id from shared dir
-RUN_ID=$(cat "${SHARED_DIR}/run_id")
-export RUN_ID
-
 # Extract kubeconfig from shared dir
 export KUBECONFIG="${SHARED_DIR}/kubeconfig"
 # Export adapter parameters for the test
@@ -72,4 +68,4 @@ export API_CHART_REF="${API_CHART_REF:-main}"
 export API_CHART_PATH="${API_CHART_PATH:-charts}"
 
 # Run e2e tests via --label-filter
-"${E2E_BIN}" test --label-filter="${LABEL_FILTER}" --flake-attempts="${FLAKE_ATTEMPTS:-2}" --junit-report "${ARTIFACT_DIR}/junit.xml"
+RUN_ID="$(cat "${SHARED_DIR}/run_id")" "${E2E_BIN}" test --label-filter="${LABEL_FILTER}" --flake-attempts="${FLAKE_ATTEMPTS:-2}" --junit-report "${ARTIFACT_DIR}/junit.xml"