diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8cb0082de..237f36ec7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,5 +1,8 @@
 container:
   kubernetes: &kubernetes
+    gitEnvFrom:
+      - secretRef:
+          name: oss-github-ssh-credentials
     sidecars:
     - image: us-west1-docker.pkg.dev/ci-compute/buildkite-images/buildkite-dind:v1
       command:
@@ -31,15 +34,13 @@ container:
       - name: docker-sock
         emptyDir: {}
 
+agents:
+  queue: "buildkite-gcp"
 steps:
   - label: "fossa analyze"
-    agents:
-      queue: "buildkite-gcp-medium-helm"
     command: ".buildkite/scripts/fossa.sh"
 
   - label: ":golang: unit-test"
-    agents:
-      queue: "buildkite-gcp-large-helm"
     artifact_paths:
       - ".build/*/coverage/*.out"
       - ".build/cover.out"
@@ -60,8 +61,6 @@ steps:
           config: docker/buildkite/docker-compose.yml
 
   - label: ":golangci-lint: validate code is clean"
-    agents:
-      queue: "buildkite-gcp-large-helm"
     artifact_paths: [ ]
     retry:
       automatic:
@@ -81,8 +80,6 @@ steps:
           config: docker/buildkite/docker-compose.yml
 
   - label: ":golang: integration-test-sticky-off"
-    agents:
-      queue: "buildkite-gcp-large-helm"
     artifact_paths:
       - ".build/*/coverage/*.out"
     retry:
@@ -103,8 +100,6 @@ steps:
           config: docker/buildkite/docker-compose.yml
 
   - label: ":golang: integration-test-sticky-on"
-    agents:
-      queue: "buildkite-gcp-large-helm"
     artifact_paths:
       - ".build/*/coverage/*.out"
     retry:
@@ -125,8 +120,6 @@ steps:
           config: docker/buildkite/docker-compose.yml
 
   - label: ":golang: integration-test-grpc-adapter"
-    agents:
-      queue: "buildkite-gcp-large-helm"
     artifact_paths:
       - ".build/*/coverage/*.out"
     retry:
@@ -149,8 +142,6 @@ steps:
   - wait
 
   - label: ":golang: code-coverage"
-    agents:
-      queue: "buildkite-gcp-large-helm"
     plugins:
       - kubernetes:
           <<: *kubernetes