diff --git a/Dockerfile b/Dockerfile
index 4268e472f..bfdce234b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -144,7 +144,8 @@ RUN \
     rm -R /home/wekan/app_build && \
     rm /home/wekan/install_meteor.sh
 
-ENV PORT=80
+ENV PORT=8080
 EXPOSE $PORT
+USER wekan
 
 CMD ["node", "/build/main.js"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 34e32d5e4..79c4ec434 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,7 +33,7 @@ services:
         - METEOR_EDGE=${METEOR_EDGE}
         - USE_EDGE=${USE_EDGE}
     ports:
-      - 80:80
+      - 8080:80
     environment:
       - MONGO_URL=mongodb://wekandb:27017/wekan
       - ROOT_URL=http://localhost