diff --git a/.dockerignore b/.dockerignore
index 5b0f3d46c..f930729dd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
 *
-!docker/default.conf
+!docker/default.conf.template
 !docker/conf.json.template
 !docker/config_env_subst.sh
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 746c68a31..28fb7c9a4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,13 +4,17 @@
 #
 # Copyright (c) 2021-present Kaleidos Ventures SL
 
-FROM nginx:1.19-alpine
+FROM nginxinc/nginx-unprivileged:1.19-alpine
 LABEL maintainer="support@taiga.io"
+ENV LISTEN_PORT=80
+EXPOSE 80
 
-COPY docker/default.conf /etc/nginx/conf.d/default.conf
+COPY docker/default.conf.template /etc/nginx/templates/default.conf.template
 COPY docker/conf.json.template /
 COPY docker/config_env_subst.sh /docker-entrypoint.d/30_config_env_subst.sh
 
+USER 0
+
 RUN set -eux; \
     apk update; \
     apk add --no-cache --virtual .build-deps \
@@ -35,4 +39,5 @@ RUN set -eux; \
     rm source.zip; \
     # Ready for nginx
     mv /taiga/dist/* /usr/share/nginx/html; \
-    rm -rf /taiga
+    rm -rf /taiga; \
+    chmod -R a+rwX /usr/share/nginx/html
diff --git a/docker/default.conf b/docker/default.conf.template
similarity index 82%
rename from docker/default.conf
rename to docker/default.conf.template
index 7c7677492..b2a95c7ab 100644
--- a/docker/default.conf
+++ b/docker/default.conf.template
@@ -1,5 +1,5 @@
 server {
-    listen 80 default_server;
+    listen ${LISTEN_PORT} default_server;
 
     client_max_body_size 100M;
     charset utf-8;