diff --git a/.buildkite/.pipeline_gen_v2 b/.buildkite/.pipeline_gen_v2
new file mode 100644
index 000000000..e69de29bb
diff --git a/.buildkite/ci_config.yaml b/.buildkite/ci_config.yaml
new file mode 100644
index 000000000..53bc8eb29
--- /dev/null
+++ b/.buildkite/ci_config.yaml
@@ -0,0 +1,9 @@
+name: vllm_ci
+job_dirs:
+  - ".buildkite/jobs"
+run_all_patterns: []
+run_all_exclude_patterns: []
+registries: public.ecr.aws/q9t5s3a7
+repositories:
+  main: "vllm-ci-postmerge-repo"
+  premerge: "vllm-ci-test-repo"
diff --git a/.buildkite/jobs/build.yaml b/.buildkite/jobs/build.yaml
new file mode 100644
index 000000000..23407220d
--- /dev/null
+++ b/.buildkite/jobs/build.yaml
@@ -0,0 +1,9 @@
+group: Build
+steps:
+  - label: ":docker: Build image"
+    key: image-build
+    commands:
+      - "aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/q9t5s3a7"
+      - "docker build --file docker/Dockerfile.ci -t vllm-omni-ci ."
+      - "docker tag vllm-omni-ci public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT"
+      - "docker push public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT"
diff --git a/.buildkite/jobs/tests.yaml b/.buildkite/jobs/tests.yaml
new file mode 100644
index 000000000..2afe26941
--- /dev/null
+++ b/.buildkite/jobs/tests.yaml
@@ -0,0 +1,27 @@
+group: Tests
+depends_on: image-build
+steps:
+- label: "Simple Unit Test"
+  commands:
+    - ".buildkite/scripts/simple_test.sh"
+  no_gpu: true
+
+- label: "Diffusion Model Test"
+  timeout_in_minutes: 15
+  commands:
+    - pytest -s -v tests/single_stage/test_diffusion_model.py
+
+- label: "Omni Model Test"
+  timeout_in_minutes: 15
+  gpu: h100
+  commands:
+    - export VLLM_LOGGING_LEVEL=DEBUG
+    - export VLLM_WORKER_MULTIPROC_METHOD=spawn
+    - pytest -s -v tests/multi_stages/
+
+- label: "Omni Model Test with H100"
+  timeout_in_minutes: 20
+  gpu: h100
+  commands:
+    - export VLLM_WORKER_MULTIPROC_METHOD=spawn
+    - pytest -s -v tests/multi_stages_h100/
\ No newline at end of file