diff --git a/buildkite/test-template-amd.j2 b/buildkite/test-template-amd.j2
index 5f68479b..e40d1b4a 100644
--- a/buildkite/test-template-amd.j2
+++ b/buildkite/test-template-amd.j2
@@ -327,7 +327,12 @@ plugins:
           {% else %}
           queue: amd_mi325_1
           {% endif %}
+        {% if step.num_nodes < 2 %}
         command: bash .buildkite/scripts/hardware_ci/run-amd-test.sh "(command rocm-smi || true) && export VLLM_ALLOW_DEPRECATED_BEAM_SEARCH=1 && cd {{ (step.working_dir or default_working_dir) | safe  }} ; {{ step.command  or (step.commands | join(" && ")) | safe }}"
+        {% else %}
+        commands:
+          - .buildkite/scripts/run-multi-node-test.sh {{ (step.working_dir or default_working_dir) | safe }} {{ step.num_nodes }} {{ step.num_gpus }} {{ docker_image_amd }} {% for command in step.commands %}"{{ (command | join(' && ')) | safe }}" {% endfor %}
+        {% endif %}
         env:
           DOCKER_BUILDKIT: "1"
         priority: 100