diff --git a/build/clean_build.sh b/build/clean_build.sh
index a857a1b3ea..f989cba95e 100755
--- a/build/clean_build.sh
+++ b/build/clean_build.sh
@@ -50,13 +50,15 @@ fi
  mkdir -p src pkg bin "$(dirname "$tc_dir")"
 )
 rsync -a --exclude=/dist --exclude=/.m2 "${tc_volume}/" "$tc_dir";
-if ! [ -d ${tc_dir}/.git ]; then
+if [ -d "${tc_volume}/.git" ] && [ ! -d ${tc_dir}/.git ]; then
 	rsync -a "${tc_volume}/.git" $tc_dir; # Docker for Windows compatibility
 fi
 
 cd "$tc_dir"
-# In case the mirrored repo already exists, remove gitignored files
-git clean -fdX
+if [ -d "${tc_volume}/.git" ]; then
+	# In case the mirrored repo already exists, remove gitignored files
+	git clean -fdX
+fi
 
 rm -rf "dist"
 mkdir -p "${tc_volume}/dist"
diff --git a/infrastructure/docker/build/Dockerfile-docs b/infrastructure/docker/build/Dockerfile-docs
index 9b9dae6bad..a37079a0c8 100644
--- a/infrastructure/docker/build/Dockerfile-docs
+++ b/infrastructure/docker/build/Dockerfile-docs
@@ -44,7 +44,6 @@ RUN	python3 -m pip install --upgrade setuptools && \
 	python3 -m pip install -r /docs.requirements.txt
 ###
 
-ADD build/clean_build.sh /
-CMD /clean_build.sh docs
+CMD /trafficcontrol/build/clean_build.sh docs
 
 # vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-grove b/infrastructure/docker/build/Dockerfile-grove
index 6acac11763..9996ed21dd 100644
--- a/infrastructure/docker/build/Dockerfile-grove
+++ b/infrastructure/docker/build/Dockerfile-grove
@@ -45,10 +45,8 @@ RUN go_version=$(cat /GO_VERSION) && \
 
 ###
 
-ADD build/clean_build.sh /
-
 ENV GOPATH=/go
 RUN mkdir -p /go/src/github.com/apache && ln -s /tmp/trafficcontrol /go/src/github.com/apache/trafficcontrol
-CMD /clean_build.sh grove
+CMD /trafficcontrol/build/clean_build.sh grove
 
 # vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-grovetccfg b/infrastructure/docker/build/Dockerfile-grovetccfg
index f139b6a6bb..34679d9a34 100644
--- a/infrastructure/docker/build/Dockerfile-grovetccfg
+++ b/infrastructure/docker/build/Dockerfile-grovetccfg
@@ -45,10 +45,8 @@ RUN go_version=$(cat /GO_VERSION) && \
 
 ###
 
-ADD build/clean_build.sh /
-
 ENV GOPATH=/go
 RUN mkdir -p /go/src/github.com/apache && ln -s /tmp/trafficcontrol /go/src/github.com/apache/trafficcontrol
-CMD /clean_build.sh grove/grovetccfg
+CMD /trafficcontrol/build/clean_build.sh grove/grovetccfg
 
 # vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-source b/infrastructure/docker/build/Dockerfile-source
index e4e9d17f74..9de6c3c6ee 100644
--- a/infrastructure/docker/build/Dockerfile-source
+++ b/infrastructure/docker/build/Dockerfile-source
@@ -37,7 +37,6 @@ RUN	yum -y install \
 	yum -y clean all
 
 WORKDIR /trafficcontrol
-ADD build/clean_build.sh /
-CMD /clean_build.sh tarball
+CMD build/clean_build.sh tarball
 
 # vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index 77c1bfc6a7..74a906654b 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -47,7 +47,6 @@ RUN go_version=$(cat /GO_VERSION) && \
 
 ###
 
-ADD build/clean_build.sh /
-CMD /clean_build.sh traffic_monitor
+CMD /trafficcontrol/build/clean_build.sh traffic_monitor
 
 # vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index b93f99371b..3f4ab376a5 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -52,7 +52,6 @@ RUN go_version=$(cat /GO_VERSION) && \
 
 ###
 
-ADD build/clean_build.sh /
-CMD /clean_build.sh traffic_ops
+CMD /trafficcontrol/build/clean_build.sh traffic_ops
 
 # vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops_ort b/infrastructure/docker/build/Dockerfile-traffic_ops_ort
index 57c7b0246a..550ab95d30 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops_ort
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops_ort
@@ -33,7 +33,6 @@ RUN go_version=$(cat /GO_VERSION) && \
 	ln -s /usr/local/go/bin/go /usr/bin/go && \
 	rm go.tar.gz
 
-ADD build/clean_build.sh /
-CMD /clean_build.sh traffic_ops_ort
+CMD /trafficcontrol/build/clean_build.sh traffic_ops_ort
 
 #vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 86043e485d..8d516bc36e 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -54,7 +54,6 @@ RUN	echo '{ "allow_root": true }' > /root/.bowerrc
 
 ###
 
-ADD build/clean_build.sh /
-CMD /clean_build.sh traffic_portal
+CMD /trafficcontrol/build/clean_build.sh traffic_portal
 
 # vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index b167371ff5..263a811d76 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -47,7 +47,6 @@ RUN curl -L https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3
 
 ###
 
-ADD build/clean_build.sh /
-CMD /clean_build.sh traffic_router
+CMD /trafficcontrol/build/clean_build.sh traffic_router
 
 # vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index 9725a2f387..3901b89e1c 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -45,7 +45,6 @@ RUN go_version=$(cat /GO_VERSION) && \
 
 ###
 
-ADD build/clean_build.sh /
-CMD /clean_build.sh traffic_stats
+CMD /trafficcontrol/build/clean_build.sh traffic_stats
 
 # vi:syntax=Dockerfile