diff --git a/kubernetes/buildkite/linux-agents.yaml b/kubernetes/buildkite/linux-agents.yaml
index b099033..14abe1b 100644
--- a/kubernetes/buildkite/linux-agents.yaml
+++ b/kubernetes/buildkite/linux-agents.yaml
@@ -58,7 +58,7 @@ spec:
                 fieldRef:
                  fieldPath: metadata.name
             - name: BUILDKITE_AGENT_TAGS
-              value: "queue=linux,name=$(POD_NAME)"
+              value: "queue=linux,name=$(POD_NAME),cluster=google"
             - name: BUILDKITE_BUILD_PATH
               value: "/var/lib/buildkite-agent/builds"
             - name: CONDUIT_TOKEN
diff --git a/scripts/buildkite/sample_build.py b/scripts/buildkite/sample_build.py
index bb9c42e..2eb6c62 100644
--- a/scripts/buildkite/sample_build.py
+++ b/scripts/buildkite/sample_build.py
@@ -8,8 +8,11 @@ if __name__ == '__main__':
   parser = argparse.ArgumentParser(description='Run sample build on buildkite.')
   parser.add_argument('--dryrun', action='store_true')
   parser.add_argument('--commit')
-  pipeline='upstream-bazel-test'
+  parser.add_argument('--pipeline', default='llvm-main')
+
   args = parser.parse_args()
+
+  pipeline=args.pipeline
   time.sleep(2)
   d = json.dumps({
       'branch': 'main',
@@ -17,7 +20,7 @@ if __name__ == '__main__':
       'env': {
           'ph_log_level': 'DEBUG',
           #'ph_skip_linux': 'skip',
-          'ph_linux_agents': '{"queue": "linux-google-test"}',
+          'ph_linux_agents': '{"queue": "linux-test-google"}',
           #'ph_linux_agents': '{"queue": "linux-test"}',
           # 'ph_linux_agents': '{"queue": "linux-clang15-test"}',
           'ph_skip_windows': 'skip',
@@ -35,8 +38,6 @@ if __name__ == '__main__':
   if token is None:
     print("'BUILDKITE_API_TOKEN' environment variable is not set")
     exit(1)
-
-  print(f"token {token}")
   re = requests.post(f'https://api.buildkite.com/v2/organizations/llvm-project/pipelines/{pipeline}/builds',
     data=d,
     headers={'Authorization': f'Bearer {token}'})