diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 000000000..57e097e7d
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo building $1
+npm clean-install
+npm run build $*
diff --git a/docker/docker-entrypoint.d/30-sed-on-appconfig.sh b/docker/docker-entrypoint.d/30-sed-on-appconfig.sh
index 2ad355122..f28f8f405 100755
--- a/docker/docker-entrypoint.d/30-sed-on-appconfig.sh
+++ b/docker/docker-entrypoint.d/30-sed-on-appconfig.sh
@@ -93,10 +93,9 @@ fi
 
 # application specific ce replacements
 
-if [ -n "${APP_BASE_SHARE_URL}" ];then
+if [ -n "${APP_BASE_SHARE_URL}" ]; then
   replace="\/"
   encoded=${APP_BASE_SHARE_URL//\//$replace}
   sed -e "s/\"baseShareUrl\": \".*\"/\"baseShareUrl\": \"${encoded}\"/g" \
-    -i /tmp/app.config.json && \
-  cat /tmp/app.config.json > ./app.config.json
+    -i "${NGINX_ENVSUBST_OUTPUT_DIR}/app.config.json"
 fi
diff --git a/docker/run-content-ce.sh b/docker/run-content-ce.sh
index a1587074e..4ce190501 100755
--- a/docker/run-content-ce.sh
+++ b/docker/run-content-ce.sh
@@ -2,4 +2,10 @@
 
 set -e
 
-env PROJECT_NAME=app BASE_PATH=/workspace DOCKER_IMAGE_REPO=alfresco/alfresco-content-app $(dirname "$0")/run.sh
+[[ "$BUILD_ENABLED" == "true" ]] && $(dirname $0)/build.sh
+
+env \
+  PROJECT_NAME=app \
+  BASE_PATH=/workspace \
+  DOCKER_IMAGE_REPO=alfresco/alfresco-content-app \
+  $(dirname $0)/run.sh
diff --git a/docker/run.sh b/docker/run.sh
index c4c7ad088..637ed8367 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -2,11 +2,6 @@
 
 set -e
 
-if [[ "$BUILD_ENABLED" == "true" ]]
-then
-  npm clean-install
-  npm run build
-fi
 docker rmi -f $DOCKER_IMAGE_REPO
 docker build --build-arg PROJECT_NAME=$PROJECT_NAME -t $DOCKER_IMAGE_REPO .
 echo http://localhost:8080$BASE_PATH