diff --git a/scripts/test-template-aws.j2 b/scripts/test-template-aws.j2
index 297259b..336ab77 100644
--- a/scripts/test-template-aws.j2
+++ b/scripts/test-template-aws.j2
@@ -256,6 +256,15 @@ steps:
       queue: ibm-ppc64le
     command: bash .buildkite/run-cpu-test-ppc64le.sh
 
+  {% if branch == "main" %}
+  - label: "GH200 Test"
+    depends_on: ~
+    soft_fail: true
+    agents:
+      queue: gh200_queue
+    command: bash .buildkite/run-gh200-test.sh
+  {% else %}
+
   - label: "TPU Test"
     depends_on: ~
     agents: