diff --git a/Dockerfile b/Dockerfile
index 77d5dd134..613d7ab91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,10 +19,11 @@ COPY docker/docker-entrypoint.d/* /docker-entrypoint.d/
 
 COPY dist/$PROJECT_NAME /usr/share/nginx/html/
 COPY dist/$PROJECT_NAME/app.config.json /etc/nginx/templates/app.config.json.template
+COPY --from=builder /usr/src/alfresco/licenses /usr/share/nginx/html/
 
 USER root
 RUN chmod a+w -R /etc/nginx/conf.d
 USER 101
 
-ENV BASE_PATH=/$PROJECT_NAME
+ENV BASE_PATH=/
 ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx/conf.d
diff --git a/docker/default.conf.template b/docker/default.conf.template
index a631665fc..8edb8491d 100644
--- a/docker/default.conf.template
+++ b/docker/default.conf.template
@@ -7,20 +7,16 @@ server {
 
     rewrite ^([^.]*[^/])$ $1/ permanent;
 
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-    }
-
-    location = /app.config.json {
-        root   ${NGINX_ENVSUBST_OUTPUT_DIR};
-    }
-
     location ${BASE_PATH} {
+        set $EVAL_BASE_PATH "${BASE_PATH}";
+        if ($EVAL_BASE_PATH = "/") {
+            root   /usr/share/nginx/html;
+        }
+        index  index.html index.htm;
         alias  /usr/share/nginx/html;
     }
 
-    location = ${BASE_PATH}/app.config.json {
+    location ~ /app.config.json {
         alias  ${NGINX_ENVSUBST_OUTPUT_DIR}/app.config.json;
     }
 
diff --git a/docker/run-content-ce.sh b/docker/run-content-ce.sh
index 4ce190501..c28a968b2 100755
--- a/docker/run-content-ce.sh
+++ b/docker/run-content-ce.sh
@@ -6,6 +6,6 @@ set -e
 
 env \
   PROJECT_NAME=app \
-  BASE_PATH=/workspace \
+  BASE_PATH=${BASE_PATH:-/workspace} \
   DOCKER_IMAGE_REPO=alfresco/alfresco-content-app \
   $(dirname $0)/run.sh