diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index ee21b22356..e48451f3f1 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -1,27 +1,30 @@
+# syntax=docker/dockerfile:1.7-labs
+
 # Target with dependencies to build all flow tools from their sources.
 # i.e., "./build_openroad.sh --local" from inside a docker container
 # NOTE: don't use this file directly unless you know what you are doing,
 # instead use etc/DockerHelper.sh
-ARG fromImage=openroad/flow-ubuntu22.04-dev:latest
-
-FROM $fromImage AS openroad-builder-base
-
-ARG numThreads=$(nproc)
-
-COPY . /OpenROAD-flow-scripts
-WORKDIR /OpenROAD-flow-scripts
 
-RUN ./build_openroad.sh --no_init --local --threads ${numThreads}
+ARG fromImage=openroad/flow-ubuntu22.04-dev:latest
 
+# TODO: Prepare long-term dependencies here
 FROM $fromImage AS openroad-flow-scripts-base
 
-COPY . /OpenROAD-flow-scripts
-
-RUN rm -rf /OpenROAD-flow-scripts/tools /OpenROAD-flow-scripts/.git
-
-COPY --from=openroad-builder-base /OpenROAD-flow-scripts/tools/install /OpenROAD-flow-scripts/tools/install
+WORKDIR /OpenROAD-flow-scripts
+COPY --exclude=.git* --exclude=tools/ --exclude=docs/ . /OpenROAD-flow-scripts/
 
-FROM $fromImage
+FROM $fromImage AS openroad-builder-base
 
-COPY --from=openroad-flow-scripts-base /OpenROAD-flow-scripts /OpenROAD-flow-scripts
 WORKDIR /OpenROAD-flow-scripts
+COPY --parents --link .git tools dev_env.sh build_openroad.sh ./
+
+# RUN ./build_openroad.sh --no_init --local --threads $(nproc)
+#
+# # TODO: Copy remaining files from the repository
+# FROM openroad-flow-scripts-base AS openroad-flow-scripts-merged
+# COPY --from=openroad-builder-base /OpenROAD-flow-scripts/tools/install /OpenROAD-flow-scripts/tools/install
+#
+# FROM $fromImage
+#
+# COPY --from=openroad-flow-scripts-merged /OpenROAD-flow-scripts /OpenROAD-flow-scripts
+# WORKDIR /OpenROAD-flow-scripts