diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index a0484852fe04e..edf707d8e4195 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -455,7 +455,8 @@ steps:
       - "**/test-results.xml"
       - "**/*.abilist"
     agents:
-      queue: "libcxx-builders-macos"
+      queue: "libcxx-builders"
+      os: "macos"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
@@ -467,7 +468,8 @@ steps:
     artifact_paths:
       - "**/test-results.xml"
     agents:
-      queue: "libcxx-builders-macos"
+      queue: "libcxx-builders"
+      os: "macos"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
@@ -478,7 +480,8 @@ steps:
     artifact_paths:
       - "**/test-results.xml"
     agents:
-      queue: "libcxx-builders-macos"
+      queue: "libcxx-builders"
+      os: "macos"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
@@ -490,7 +493,8 @@ steps:
     artifact_paths:
       - "**/test-results.xml"
     agents:
-      queue: "libcxx-builders-macos10.15" # TODO: For now, we're running the back-deployment tests for 10.9 on 10.15, because we don't have proper 10.9 machines
+      queue: "libcxx-builders"
+      os: "macos10.15" # TODO: For now, we're running the back-deployment tests for 10.9 on 10.15, because we don't have proper 10.9 machines
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
@@ -501,7 +505,8 @@ steps:
     artifact_paths:
       - "**/test-results.xml"
     agents:
-      queue: "libcxx-builders-macos10.15"
+      queue: "libcxx-builders"
+      os: "macos10.15"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost