diff --git a/README.md b/README.md
index 3aa0c7e706..bc96b187fa 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,8 @@ sudo systemctl start infinity
 #### Deploy using Docker on Linux x86_64 and MacOS x86_64
 
 ```bash
-docker pull infiniflow/infinity
-docker run -d --name infinity -v /tmp/infinity/:/tmp/infinity --network=host infiniflow/infinity ./opt/bin/infinity
+docker pull infiniflow/infinity:nightly
+docker run -d --name infinity -v /tmp/infinity/:/tmp/infinity --network=host infiniflow/infinity:nightly
 ```
 
 
diff --git a/scripts/Dockerfile_build_environment_ubuntu_2004 b/scripts/Dockerfile_infinity_builder_ubuntu2004
similarity index 100%
rename from scripts/Dockerfile_build_environment_ubuntu_2004
rename to scripts/Dockerfile_infinity_builder_ubuntu2004
diff --git a/Dockerfile b/scripts/Dockerfile_infinity_builder_ubuntu2310
similarity index 88%
rename from Dockerfile
rename to scripts/Dockerfile_infinity_builder_ubuntu2310
index ae693a5fa8..3f5c61ce40 100644
--- a/Dockerfile
+++ b/scripts/Dockerfile_infinity_builder_ubuntu2310
@@ -34,8 +34,8 @@ RUN cargo install sqllogictest-bin
 
 # CMake 3.28+ is requrired for C++20 modules.
 # download https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.tar.gz
-COPY cmake-3.28.1-linux-x86_64.tar.gz .
-RUN tar xzf cmake-3.28.1-linux-x86_64.tar.gz && cp -rf cmake-3.28.1-linux-x86_64/bin/* /usr/local/bin && cp -rf cmake-3.28.1-linux-x86_64/share/* /usr/local/share && rm -fr cmake-3.28.1-linux-x86_64
+RUN --mount=type=bind,source=cmake-3.28.1-linux-x86_64.tar.gz,target=/root/cmake-3.28.1-linux-x86_64.tar.gz \
+    cd /root && tar xzf cmake-3.28.1-linux-x86_64.tar.gz && cp -rf cmake-3.28.1-linux-x86_64/bin/* /usr/local/bin && cp -rf cmake-3.28.1-linux-x86_64/share/* /usr/local/share && rm -fr cmake-3.28.1-linux-x86_64
 
 # build dependencies
 RUN apt install -y liblz4-dev libboost1.81-dev liburing-dev libgflags-dev libevent-dev libthrift-dev
diff --git a/scripts/infinity_builder_centos7_download_deps.sh b/scripts/download_deps_infinity_builder_centos7.sh
similarity index 100%
rename from scripts/infinity_builder_centos7_download_deps.sh
rename to scripts/download_deps_infinity_builder_centos7.sh