diff --git a/scripts/ci_aws_bootstrap.sh b/scripts/ci_aws_bootstrap.sh
index 3a9146d6..2f6314a3 100644
--- a/scripts/ci_aws_bootstrap.sh
+++ b/scripts/ci_aws_bootstrap.sh
@@ -60,23 +60,18 @@ fi
 
 patterns=(
     ".buildkite/test-pipeline"
-    "Dockerfile"
+    "docker/Dockerfile"
     "CMakeLists.txt"
-    "requirements*"
+    "requirements/common.txt"
+    "requirements/cuda.txt"
+    "requirements/build.txt"
+    "requirements/test.txt"
     "setup.py"
     "csrc/"
 )
 
 ignore_patterns=(
-    "Dockerfile.rocm"
-    "Dockerfile.rocm_base"
-    "requirements-rocm"
-    "requirements-hpu"
-    "requirements-openvino"
-    "requirements-neuron"
-    "requirements-tpu"
-    "requirements-xpu"
-    "requirements-cpu"
+    "docker/Dockerfile."
 )
 
 for file in $file_diff; do
diff --git a/scripts/pipeline_generator/pipeline_generator_helper.py b/scripts/pipeline_generator/pipeline_generator_helper.py
index a13470f2..e9165030 100644
--- a/scripts/pipeline_generator/pipeline_generator_helper.py
+++ b/scripts/pipeline_generator/pipeline_generator_helper.py
@@ -61,6 +61,7 @@ def get_build_commands(container_registry: str, buildkite_commit: str, container
 """
     docker_build_command = (
         f"docker build "
+        f"--file docker/Dockerfile "
         f"--build-arg max_jobs=64 "
         f"--build-arg buildkite_commit={buildkite_commit} "
         f"--build-arg USE_SCCACHE=1 "
diff --git a/scripts/test-template-aws.j2 b/scripts/test-template-aws.j2
index 7ca043c5..02501996 100644
--- a/scripts/test-template-aws.j2
+++ b/scripts/test-template-aws.j2
@@ -31,7 +31,7 @@ steps:
           echo "Image found"
           exit 0
         fi
-      - "docker build --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --tag {{ docker_image }} --target test --progress plain ."
+      - "docker build --file docker/Dockerfile --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --tag {{ docker_image }} --target test --progress plain ."
       - "docker push {{ docker_image }}"
     env:
       DOCKER_BUILDKIT: "1"
@@ -65,7 +65,7 @@ steps:
           echo "Image found"
           exit 0
         fi
-      - "docker build --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --build-arg CUDA_VERSION=12.1.0 --tag {{ docker_image_cu121 }} --target test --progress plain ."
+      - "docker build --file docker/Dockerfile --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --build-arg CUDA_VERSION=12.1.0 --tag {{ docker_image_cu121 }} --target test --progress plain ."
       - "docker push {{ docker_image_cu121 }}"
     env:
       DOCKER_BUILDKIT: "1"
@@ -99,7 +99,7 @@ steps:
           echo "Image found"
           exit 0
         fi
-      - "docker build --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --build-arg CUDA_VERSION=11.8.0 --tag {{ docker_image_cu118 }} --target test --progress plain ."
+      - "docker build --file docker/Dockerfile --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --build-arg CUDA_VERSION=11.8.0 --tag {{ docker_image_cu118 }} --target test --progress plain ."
       - "docker push {{ docker_image_cu118 }}"
     env:
       DOCKER_BUILDKIT: "1"
@@ -253,7 +253,7 @@ steps:
         soft_fail: true
         commands:
           # Handle the introduction of test target in Dockerfile.rocm
-          - "grep -i 'from base as test' Dockerfile.rocm && docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f Dockerfile.rocm --target test --progress plain . || docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f Dockerfile.rocm --progress plain ."
+          - "grep -i 'from base as test' docker/Dockerfile.rocm && docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f docker/Dockerfile.rocm --target test --progress plain . || docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f docker/Dockerfile.rocm --progress plain ."
           - "docker push {{ docker_image_amd }}"
         key: "amd-build"
         env:
diff --git a/scripts/test-template-fastcheck.j2 b/scripts/test-template-fastcheck.j2
index 21332cf0..9329fbdd 100644
--- a/scripts/test-template-fastcheck.j2
+++ b/scripts/test-template-fastcheck.j2
@@ -20,7 +20,7 @@ steps:
           echo "Image found"
           exit 0
         fi
-      - "docker build --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --tag {{ docker_image }} --target test --progress plain ."
+      - "docker build --file docker/Dockerfile --build-arg max_jobs=16 --build-arg buildkite_commit=$BUILDKITE_COMMIT --build-arg USE_SCCACHE=1 --tag {{ docker_image }} --target test --progress plain ."
       - "docker push {{ docker_image }}"
     env:
       DOCKER_BUILDKIT: "1"
@@ -267,7 +267,7 @@ steps:
         depends_on: block-amd-build
         soft_fail: true
         commands:
-          - "grep -i 'from base as test' Dockerfile.rocm && docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f Dockerfile.rocm --target test --progress plain . || docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f Dockerfile.rocm --progress plain ."
+          - "grep -i 'from base as test' Dockerfile.rocm && docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f docker/Dockerfile.rocm --target test --progress plain . || docker build --build-arg max_jobs=16 --tag {{ docker_image_amd }} -f docker/Dockerfile.rocm --progress plain ."
           - "docker push {{ docker_image_amd }}"
         key: amd-build
         env: