diff --git a/Dockerfile b/Dockerfile
index 68bcbbd48..1795efc7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,13 +14,26 @@ FROM nginx:stable-alpine
 LABEL version="1.7"
 LABEL maintainer="Denys Vuika <denys.vuika@alfresco.com>"
 
-COPY nginx.conf /etc/nginx/nginx.conf
+ARG GROUPNAME=Alfresco
+ARG GROUPID=1000
+ARG USERNAME=aca
+ARG USERID=33009
 
-COPY ./docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY ./docker/entrypoint.sh /
 
 WORKDIR /usr/share/nginx/html
 COPY dist/app/ .
 COPY --from=builder /usr/src/alfresco/licenses ./licenses
 
-ENTRYPOINT [ "/docker-entrypoint.sh" ]
+RUN addgroup -g ${GROUPID} ${GROUPNAME} && \
+  adduser -S -u ${USERID} -G ${GROUPNAME} -s "/bin/bash" ${USERNAME} && \
+  chown -R ${USERNAME}:${GROUPNAME} /var/cache/nginx && \
+  touch /var/run/nginx.pid && \
+  chown -R ${USERNAME}:${GROUPNAME} /var/run/nginx.pid && \
+  chmod +x /entrypoint.sh && \
+  chown -R ${USERNAME}:${GROUPNAME} /entrypoint.sh
+
+EXPOSE 8080
+USER ${USERNAME}
+ENTRYPOINT [ "/entrypoint.sh" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 233fdfca6..a513d6a42 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -96,7 +96,7 @@ services:
     networks:
       - internal
     ports:
-      - 4001:80
+      - 4001:8080
     # volumes:
     #     - ./app.config.json:/usr/share/nginx/html/app.config.json
     #     - ./nginx.conf:/etc/nginx/conf.d/default.conf
diff --git a/docker-entrypoint.sh b/docker/entrypoint.sh
similarity index 100%
rename from docker-entrypoint.sh
rename to docker/entrypoint.sh
diff --git a/docker/proxy/nginx.conf b/docker/proxy/nginx.conf
index 808f13ad0..0eac5ac24 100644
--- a/docker/proxy/nginx.conf
+++ b/docker/proxy/nginx.conf
@@ -16,7 +16,7 @@ server {
     proxy_pass_header Set-Cookie;
 
     location / {
-      proxy_pass http://content-app;
+      proxy_pass http://content-app:8080;
     }
 
     location /alfresco/ {
diff --git a/nginx.conf b/nginx.conf
index 2e968f4a6..c994d24ef 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -6,7 +6,7 @@ events {
 
 http {
   server {
-    listen 80;
+    listen 8080;
     server_name  localhost;
 
     root   /usr/share/nginx/html;