diff --git a/clang/utils/ci/buildkite-pipeline.yml b/clang/utils/ci/buildkite-pipeline.yml
index 3bc4f23f8763c..a4b72d72c76df 100644
--- a/clang/utils/ci/buildkite-pipeline.yml
+++ b/clang/utils/ci/buildkite-pipeline.yml
@@ -22,8 +22,7 @@ steps:
       - "clang/utils/ci/run-buildbot check-format"
 
     agents:
-      queue: "libcxx-builders"
-      os: "linux"
+      queue: "linux"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
@@ -35,12 +34,8 @@ steps:
   - label: "Building clang"
     commands:
       - "clang/utils/ci/run-buildbot build-clang"
-    env:
-        CC: "clang-${LLVM_HEAD_VERSION}"
-        CXX: "clang++-${LLVM_HEAD_VERSION}"
     agents:
-      queue: "libcxx-builders"
-      os: "linux"
+      queue: "linux"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
@@ -49,7 +44,7 @@ steps:
 
   - wait
 
-  - label: "C++03"
+  - label: "Running libc++ test suite in C++03"
     commands:
       - "clang/utils/ci/run-buildbot generic-cxx03"
     artifact_paths:
@@ -59,15 +54,14 @@ steps:
         LLVM_SYMBOLIZER_PATH: "/usr/bin/llvm-symbolizer-${LLVM_HEAD_VERSION}" # TODO: Should we build that from scratch?
         CLANG_CRASH_DIAGNOSTICS_DIR: "crash_diagnostics"
     agents:
-      queue: "libcxx-builders"
-      os: "linux"
+      queue: "linux"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "C++26"
+  - label: "Running libc++ test suite in C++26"
     commands:
       - "clang/utils/ci/run-buildbot generic-cxx26"
     artifact_paths:
@@ -77,15 +71,14 @@ steps:
         LLVM_SYMBOLIZER_PATH: "/usr/bin/llvm-symbolizer-${LLVM_HEAD_VERSION}" # TODO: Should we build that from scratch?
         CLANG_CRASH_DIAGNOSTICS_DIR: "crash_diagnostics"
     agents:
-      queue: "libcxx-builders"
-      os: "linux"
+      queue: "linux"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "Modules"
+  - label: "Running libc++ test suite with Clang Modules"
     commands:
       - "clang/utils/ci/run-buildbot generic-modules"
     artifact_paths:
@@ -95,8 +88,7 @@ steps:
         LLVM_SYMBOLIZER_PATH: "/usr/bin/llvm-symbolizer-${LLVM_HEAD_VERSION}" # TODO: Should we build that from scratch?
         CLANG_CRASH_DIAGNOSTICS_DIR: "crash_diagnostics"
     agents:
-      queue: "libcxx-builders"
-      os: "linux"
+      queue: "linux"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost