diff --git a/Dockerfile b/Dockerfile
index d655e88..4453611 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -154,14 +154,7 @@ WORKDIR /var/www/dotclear/app
 
 # Add container starting script
 ADD docker-entrypoint.sh /entrypoint.sh
-USER www
 ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
-USER root 
-
-# FPM must start first in daemon mode
-# Then nginx in no daemon mode
-SHELL ["/bin/sh", "-c"]
-CMD php-fpm84 -D && nginx
 
 # Docker container healthcheck
 HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping || exit 1
\ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index bd26d74..bc4d199 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -95,4 +95,8 @@ echo >&2 "│ ◦ PHP $(php84 -r "echo PHP_VERSION;")"
 echo >&2 "│ ◦ Dotclear ${VERSION_INSTALLED}"
 echo >&2 '└──'
 
+# Start web server
+php-fpm84 -D # FPM must start first in daemon mode
+nginx # Then nginx in no daemon mode
+
 exec "$@"
\ No newline at end of file