diff --git a/docker/Dockerfile b/docker/Dockerfile
index c6edac6657..bb43c029e3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -78,6 +78,8 @@ RUN \
 
 WORKDIR "serve"
 
+RUN cp docker/dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
+
 RUN \
     if echo "$BASE_IMAGE" | grep -q "cuda:"; then \
         # Install CUDA version specific binary when CUDA version is specified as a build arg
@@ -131,11 +133,9 @@ RUN useradd -m model-server \
     && mkdir -p /home/model-server/tmp
 
 COPY --chown=model-server --from=compile-image /home/venv /home/venv
-
+COPY --from=compile-image /usr/local/bin/dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
 ENV PATH="/home/venv/bin:$PATH"
 
-COPY docker/dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
-
 RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh \
     && chown -R model-server /home/model-server
 
diff --git a/docker/build_image.sh b/docker/build_image.sh
index 040fc307c2..6ca105ec9f 100755
--- a/docker/build_image.sh
+++ b/docker/build_image.sh
@@ -43,6 +43,7 @@ do
           if test $
           then
             BRANCH_NAME="$2"
+            LOCAL_CHANGES=false
             shift
           else
             echo "Error! branch_name not provided"