diff --git a/buildkite/pipeline_generator/buildkite_step.py b/buildkite/pipeline_generator/buildkite_step.py
index c2443b22..42c1dd6b 100644
--- a/buildkite/pipeline_generator/buildkite_step.py
+++ b/buildkite/pipeline_generator/buildkite_step.py
@@ -306,15 +306,21 @@ def _create_amd_mirror_step(step: Step, original_commands: List[str], amd: Dict[
     device_type = amd_device.replace("amd_", "") if amd_device.startswith("amd_") else amd_device
     amd_label = f"AMD: {step.label} ({device_type})"
 
-    # Get AMD queue name from device name
-    amd_queue = None
-    if amd_device == DeviceType.AMD_MI325_1:
-        amd_queue = AgentQueue.AMD_MI325_1
-    elif amd_device == DeviceType.AMD_MI325_8:
-        amd_queue = AgentQueue.AMD_MI325_8
-    
+    # Map device type to agent queue
+    amd_queue_map = {
+        DeviceType.AMD_MI325_1: AgentQueue.AMD_MI325_1,
+        DeviceType.AMD_MI325_2: AgentQueue.AMD_MI325_2,
+        DeviceType.AMD_MI325_4: AgentQueue.AMD_MI325_4,
+        DeviceType.AMD_MI325_8: AgentQueue.AMD_MI325_8,
+        DeviceType.AMD_MI355_1: AgentQueue.AMD_MI355_1,
+        DeviceType.AMD_MI355_2: AgentQueue.AMD_MI355_2,
+        DeviceType.AMD_MI355_4: AgentQueue.AMD_MI355_4,
+        DeviceType.AMD_MI355_8: AgentQueue.AMD_MI355_8,
+    }
+
+    amd_queue = amd_queue_map.get(amd_device)
     if not amd_queue:
-        raise ValueError(f"Invalid device: {amd_device}")
+        raise ValueError(f"Invalid AMD device: {amd_device}. Valid devices: {list(amd_queue_map.keys())}")
 
     amd_retry = {
         "automatic": [
diff --git a/buildkite/pipeline_generator/constants.py b/buildkite/pipeline_generator/constants.py
index 99bc52b8..77afa6e1 100644
--- a/buildkite/pipeline_generator/constants.py
+++ b/buildkite/pipeline_generator/constants.py
@@ -15,8 +15,13 @@ class DeviceType(str, Enum):
     ASCEND = "ascend_npu"
     AMD_CPU = "amd_cpu"
     AMD_MI325_1 = "mi325_1"
+    AMD_MI325_2 = "mi325_2"
+    AMD_MI325_4 = "mi325_4"
     AMD_MI325_8 = "mi325_8"
-
+    AMD_MI355_1 = "mi355_1"
+    AMD_MI355_2 = "mi355_2"
+    AMD_MI355_4 = "mi355_4"
+    AMD_MI355_8 = "mi355_8"
 
 
 class AgentQueue(str, Enum):
@@ -41,4 +46,10 @@ class AgentQueue(str, Enum):
     ASCEND = "ascend"
     AMD_CPU = "amd-cpu"
     AMD_MI325_1 = "amd_mi325_1"
+    AMD_MI325_2 = "amd_mi325_2"
+    AMD_MI325_4 = "amd_mi325_4"
     AMD_MI325_8 = "amd_mi325_8"
+    AMD_MI355_1 = "amd_mi355_1"
+    AMD_MI355_2 = "amd_mi355_2"
+    AMD_MI355_4 = "amd_mi355_4"
+    AMD_MI355_8 = "amd_mi355_8"