diff --git a/.buildkite/test-pipeline.yaml b/.buildkite/test-pipeline.yaml
index c8f53224b1dcf..2d5bbbf07cac9 100644
--- a/.buildkite/test-pipeline.yaml
+++ b/.buildkite/test-pipeline.yaml
@@ -194,7 +194,9 @@ steps:
   command: pytest -v -s test_logits_processor.py
 
 - label: Utils Test
-  command: pytest -v -s test_utils.py
+  commands:
+    - pytest -v -s test_utils.py
+    - pytest -v -s test_embedded_commit.py
 
 - label: Worker Test
   mirror_hardwares: [amd]
diff --git a/Dockerfile b/Dockerfile
index 67198e8fd9800..9ed065debeac0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -88,6 +88,9 @@ ENV NVCC_THREADS=$nvcc_threads
 # make sure punica kernels are built (for LoRA)
 ENV VLLM_INSTALL_PUNICA_KERNELS=1
 
+ARG buildkite_commit
+ENV BUILDKITE_COMMIT=${buildkite_commit}
+
 ARG USE_SCCACHE
 # if USE_SCCACHE is set, use sccache to speed up compilation
 RUN --mount=type=cache,target=/root/.cache/pip \
diff --git a/setup.py b/setup.py
index 485cfe36b11d6..f1769a8f1d815 100644
--- a/setup.py
+++ b/setup.py
@@ -30,8 +30,13 @@ def load_module_from_path(module_name, path):
 
 def embed_commit_hash():
     try:
-        commit_id = subprocess.check_output(["git", "rev-parse", "HEAD"],
-                                            encoding="utf-8").strip()
+        if "BUILDKITE_COMMIT" in os.environ:
+            # ci build
+            commit_id = os.environ["BUILDKITE_COMMIT"]
+        else:
+            commit_id = subprocess.check_output(["git", "rev-parse", "HEAD"],
+                                                encoding="utf-8").strip()
+
         commit_contents = f'__commit__ = "{commit_id}"\n'
 
         version_file = os.path.join(ROOT_DIR, "vllm", "commit_id.py")