diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command
index 9817ef9a3..490ff8eb8 100755
--- a/.buildkite/hooks/post-command
+++ b/.buildkite/hooks/post-command
@@ -13,12 +13,12 @@ if [[ ! "${BUILDKITE_BRANCH}" =~ ^(v.*) ]] && [[ "${BUILDKITE_COMMAND_EXIT_STATU
   if [[ "${BUILDKITE_LABEL}" == ":hammer_and_wrench: Unit Test" ]] || [[ "${BUILDKITE_LABEL}" =~ ":selenium:" ]]; then
     echo "--- :codecov: Upload coverage reports"
     NAME="UnitTest"
+    if [[ "${SUITE}" != "" ]]; then
+      NAME=${SUITE}
+    fi
     if [[ "${BUILDKITE_AGENT_META_DATA_CODECOV}" == "verbose" ]]; then
       BUILDKITE_AGENT_META_DATA_CODECOV="-v"
     fi
-    if [[ "${BUILDKITE_LABEL}" =~ ":selenium:" ]]; then
-      NAME=$(echo ${BUILDKITE_LABEL/:selenium: /} | awk '{ print $1 }')
-    fi
     codecov -Z -c -f 'coverage*.txt' -n ${NAME} -F backend "${BUILDKITE_AGENT_META_DATA_CODECOV}"
     if [[ "${BUILDKITE_LABEL}" =~ ":selenium:" ]]; then
       cd web && pnpm report
diff --git a/.buildkite/steps/e2etests.sh b/.buildkite/steps/e2etests.sh
index 7195187fd..286967fd6 100755
--- a/.buildkite/steps/e2etests.sh
+++ b/.buildkite/steps/e2etests.sh
@@ -23,10 +23,19 @@ cat << EOF
     agents:
       suite: "kubernetes"
 EOF
+elif [[ "${SUITE_NAME}" = "Standalone" ]]; then
+cat << EOF
+    agents:
+      suite: "standalone"
+EOF
 else
 cat << EOF
     agents:
       suite: "all"
 EOF
+cat << EOF
+    env:
+      SUITE: "${SUITE_NAME}"
+EOF
 fi
 done
\ No newline at end of file