diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -27,7 +27,7 @@
     artifact_paths:
       - "**/clang-format.patch"
     agents:
-      queue: "libcxx-builders"
+      queue: "service"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
@@ -40,7 +40,7 @@
     artifact_paths:
       - "**/generated_output.patch"
     agents:
-      queue: "libcxx-builders"
+      queue: "service"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -130,6 +130,7 @@
             libcxxabi/{fuzz,include,src,test} \
         | tee ${BUILD_DIR}/clang-format.patch
     # Check if the diff is empty, fail otherwise.
+    grep --version
     ! grep -q '^--- a' ${BUILD_DIR}/clang-format.patch
 ;;
 check-generated-output)
@@ -143,6 +144,7 @@
     python3 libcxx/utils/generate_header_inclusion_tests.py
     python3 libcxx/utils/generate_header_tests.py
     git diff | tee ${BUILD_DIR}/generated_output.patch
+    grep --version
     # Check if the diffs are empty, fail otherwise.
     ! grep -q '^--- a' ${BUILD_DIR}/generated_output.patch || false
     # Reject patches that introduce non-ASCII characters or hard tabs.