diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4c7dbb7e..1e5787f0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,5 +1,5 @@
 agents:
-  queue: "public"
+  queue: "public-v5"
 
 # Mount the docker.sock as to the docker container, so that we are able to
 # run docker build command and kind is spawned as a sibling container.