diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f02740b00..e92bf0e40 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -12,8 +12,7 @@ steps:
             - src
             - ext
     agents:
-      queue: "juliagpu"
-      cuda: "*"
+      queue: "cuda"
     if: build.message !~ /\[skip tests\]/
     timeout_in_minutes: 90
     matrix:
@@ -32,9 +31,7 @@ steps:
             - src
             - ext
     agents:
-      queue: "juliagpu"
-      rocm: "*"
-      rocmgpu: "*"
+      queue: "rocm"
     if: build.message !~ /\[skip tests\]/
     timeout_in_minutes: 90
     matrix: