diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 5a74e483..40556a58 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -12,4 +12,4 @@ steps:
             - "test/**"
           target: ".buildkite/run_tests.yml"
     agents:
-      queue: "juliagpu"
+      queue: "cuda"
diff --git a/.buildkite/run_tests.yml b/.buildkite/run_tests.yml
index 96b8a868..5155fbff 100644
--- a/.buildkite/run_tests.yml
+++ b/.buildkite/run_tests.yml
@@ -19,8 +19,7 @@ steps:
                 using Pkg
                 Pkg.test("FastIce"; test_args=["--backend=CUDA"], coverage=true)'
     agents:
-      queue: "juliagpu"
-      cuda: "*"
+      queue: "cuda"
     timeout_in_minutes: 120
     soft_fail:
       - exit_status: 3
@@ -45,8 +44,7 @@ steps:
                 using Pkg
                 Pkg.test("FastIce"; test_args=["--backend=AMDGPU"], coverage=true)'
     agents:
-      queue: "juliagpu"
-      rocm: "*"
+      queue: "rocm"
       rocmgpu: "*"
     timeout_in_minutes: 120
     soft_fail: