diff --git a/.buildkite/run-amd-test_tensorizer.sh b/.buildkite/run-amd-test_tensorizer.sh
index ac5da684d0cdc..c3a35288d7f5e 100644
--- a/.buildkite/run-amd-test_tensorizer.sh
+++ b/.buildkite/run-amd-test_tensorizer.sh
@@ -23,10 +23,9 @@ remove_docker_container() { docker rm -f rocm_test_tensorizer || true; }
 trap remove_docker_container EXIT
 remove_docker_container
 
-apt-get install curl libsodium23 && pytest -v -s tensorizer_loader
-
 # Run the image
 docker run --device /dev/kfd --device /dev/dri --network host \
-	--name rocm_test_tensorizer rocm /bin/bash -c "apt install curl libsodium23; \
+	--name rocm_test_tensorizer rocm /bin/bash -c "apt-get update; \
+                apt-get install curl libsodium23; \
                 python3 -m pytest -v -s vllm/tests/tensorizer_loader"
 
diff --git a/.buildkite/test-template.j2 b/.buildkite/test-template.j2
index 83d2502f070c0..176525c840fb6 100644
--- a/.buildkite/test-template.j2
+++ b/.buildkite/test-template.j2
@@ -1,4 +1,5 @@
 {% set docker_image = "us-central1-docker.pkg.dev/vllm-405802/vllm-ci-test-repo/vllm-test:$BUILDKITE_COMMIT" %}
+{% set docker_image_ROCm = "us-central1-docker.pkg.dev/vllm-405802/vllm-ci-test-repo/vllm-test:$BUILDKITE_COMMIT" %}
 {% set default_num_gpu = 1 %}
 {% set default_working_dir = "/vllm-workspace/tests" %}
 
@@ -14,72 +15,19 @@ steps:
       automatic:
         - exit_status: -1  # Agent was lost
           limit: 5
-  - wait
-
-  - label: "AMD Default Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test.sh"
-
-  - label: "AMD Regression Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_regression.sh"
-
-  - label: "AMD Async Engine Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_async_engine.sh"
-
-  - label: "AMD Basic Correctness Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_basic_correctness.sh"
-
-  - label: "AMD Core Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_core.sh"
-
-  - label: "AMD Distributed Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_distributed.sh"
-
-  - label: "AMD Engine Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_engine.sh"
-
-  - label: "AMD Examples Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_examples.sh"
-
-  - label: "AMD Llava Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_llava.sh"
-
-  - label: "AMD Prefix Caching Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_prefix_caching.sh"
-
-  - label: "AMD Logits Processor Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_logits_processor.sh"
 
-  - label: "AMD Worker Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_worker.sh"
+  - label: ":docker: build image ROCm"
+    commands:
+      - "docker build --build-arg max_jobs=16 --tag {{ docker_image_ROCm }} --target test --progress plain --file Dockerfile.rocm ."
+      - "docker push {{ docker_image_ROCm }}"
+    env:
+      DOCKER_BUILDKIT: "1"
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 5
 
-  - label: "AMD Speculative Decoding Test"
-    agents:
-      queue: amd
-    command: "bash .buildkite/run-amd-test_speculative_decoding.sh"
+  - wait
 
   - label: "AMD Tensorizer Test"
     agents: