diff --git a/.buildkite/test_areas/distributed.yaml b/.buildkite/test_areas/distributed.yaml
index d96071dfd0..3daf563dab 100644
--- a/.buildkite/test_areas/distributed.yaml
+++ b/.buildkite/test_areas/distributed.yaml
@@ -109,6 +109,7 @@ steps:
     amd:
       label: ":amd: (MI355) Distributed DP Basic"
       dind: false
+      automatic_shard: true
       device: mi355_2
       timeout_in_minutes: 45
       depends_on:
@@ -331,6 +332,7 @@ steps:
     amd:
       label: ':amd: (MI355) Distributed DP Extended'
       dind: false
+      automatic_shard: true
       device: mi355_4
       timeout_in_minutes: 60
       working_dir: /vllm-workspace/tests
@@ -706,6 +708,7 @@ steps:
     amd:
       label: ':amd: (MI355) RayExecutorV2'
       dind: false
+      automatic_shard: true
       device: mi355_4
       timeout_in_minutes: 75
       working_dir: /vllm-workspace/tests
diff --git a/.buildkite/test_areas/misc.yaml b/.buildkite/test_areas/misc.yaml
index 8b9deb1a82..29e0582ec5 100644
--- a/.buildkite/test_areas/misc.yaml
+++ b/.buildkite/test_areas/misc.yaml
@@ -709,6 +709,7 @@ steps:
     amd:
       label: ":amd: (MI300) Batch Invariance"
       dind: false
+      automatic_shard: true
       device: mi300_1
       timeout_in_minutes: 60
       depends_on: