diff --git a/ci/buildkite-pipeline-in-disk.sh b/ci/buildkite-pipeline-in-disk.sh
index 4512c6821c..6381b41235 100644
--- a/ci/buildkite-pipeline-in-disk.sh
+++ b/ci/buildkite-pipeline-in-disk.sh
@@ -182,7 +182,7 @@ all_test_steps() {
     timeout_in_minutes: 20
     artifact_paths: "bpf-dumps.tar.bz2"
     agents:
-      - "queue=default"
+      - "queue=gcp"
 EOF
   else
     annotate --style info \
diff --git a/ci/buildkite-pipeline.sh b/ci/buildkite-pipeline.sh
index b7c6bb2116..a410c7cabf 100755
--- a/ci/buildkite-pipeline.sh
+++ b/ci/buildkite-pipeline.sh
@@ -182,7 +182,7 @@ all_test_steps() {
     timeout_in_minutes: 25
     artifact_paths: "bpf-dumps.tar.bz2"
     agents:
-      - "queue=solana"
+      - "queue=gcp"
 EOF
   else
     annotate --style info \