diff --git a/.buildkite/test-template.j2 b/.buildkite/test-template.j2
index e7b24268ba398..b59690d1d5917 100644
--- a/.buildkite/test-template.j2
+++ b/.buildkite/test-template.j2
@@ -19,7 +19,7 @@ steps:
         - exit_status: -10  # Agent was lost
           limit: 5
     agents:
-      queue: amd
+      queue: docker-build
 
 {% for step in steps %}
 {% if step.mirror_hardwares and "amd" in step.mirror_hardwares %}