diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1b494923..c07ee042 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,5 +1,5 @@
 agents:
-  queue: "public-v5"
+  queue: "public"
 
 # 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.
diff --git a/tools/get-e2e-test-deps.sh b/tools/get-e2e-test-deps.sh
index f95511b1..2501650a 100755
--- a/tools/get-e2e-test-deps.sh
+++ b/tools/get-e2e-test-deps.sh
@@ -29,7 +29,7 @@ ln -sf "kubectl-${KUBE_VERSION}" kubectl
 if ! command -v kind &> /dev/null
 then
     echo "Downloading kind..."
-    curl -L https://kind.sigs.k8s.io/dl/v0.12.0/kind-linux-amd64 > "kind"
+    curl -L https://kind.sigs.k8s.io/dl/v0.20.0/kind-linux-amd64 > "kind"
     chmod +x "kind"
     echo "Installed kind"
 else