diff --git a/Dockerfile b/Dockerfile
index 00ca5d64..dd83c511 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,17 @@
 ARG DEBIAN_VERSION=buster-slim
 ARG COMPOSER_VERSION=2.1
+ARG SUPERVISORD_VERSION=v0.7.3
 
 FROM composer:${COMPOSER_VERSION} AS composer
+FROM qmcgaw/binpot:supervisord-${SUPERVISORD_VERSION} AS supervisord
 
 FROM debian:${DEBIAN_VERSION}
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Composer 2
 COPY --from=composer --chown=www-data /usr/bin/composer /usr/bin/composer
+# Supervisord from https://github.com/ochinchina/supervisord
+COPY --from=supervisord --chown=www-data /bin /usr/local/bin/supervisord
 
 # Install PHP and PHP system dependencies
 RUN apt-get update && \
@@ -20,10 +24,8 @@ RUN apt-get update && \
     php-xml php7.3-gd php7.3-mbstring \
     # Unzip for composer
     unzip \
-    # PHP FPM and sudo to run PHP-FPM without root
-    php7.3-fpm sudo \
-    # Nginx to serve HTTP and communicate with PHP-FPM
-    nginx \
+    # Nginx and PHP FPM to serve over HTTP
+    php7.3-fpm nginx \
     && \
     # Clean up
     apt-get clean && \
@@ -32,15 +34,11 @@ RUN apt-get update && \
     chown -R www-data /var/log/nginx /var/lib/nginx/
 
 # PHP FPM configuration
-# Allow to run it with sudo from user www-data
-RUN echo "www-data ALL = NOPASSWD: /usr/sbin/service php7.3-fpm start, /usr/sbin/service php7.3-fpm status, /usr/sbin/service php7.3-fpm stop" > /etc/sudoers.d/www-data && \
-    chmod 0440 /etc/sudoers.d/www-data
 # Pre-create files with the correct permissions
 RUN mkdir /run/php && \
     touch /var/log/php7.3-fpm.log && \
     chown www-data /run/php /var/log/php7.3-fpm.log && \
-    chmod 700 /run/php /var/log/php7.3-fpm.log && \
-    ln -sf /dev/stdout /var/log/php7.3-fpm.log
+    chmod 700 /run/php /var/log/php7.3-fpm.log
 
 # Nginx configuration
 EXPOSE 8000/tcp
@@ -49,6 +47,9 @@ RUN touch /run/nginx.pid && \
 COPY --chown=www-data docker/nginx.conf /etc/nginx/nginx.conf
 RUN nginx -t
 
+# Supervisord configuration
+COPY --chown=www-data docker/supervisord.conf /etc/supervisor/supervisord.conf
+
 # Create end user directory
 RUN mkdir -p /2fauth && \
     chown -R www-data /2fauth && \
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 48426a6b..8408d830 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-cleanup() {
-  set +e
-  echo "Stopping php7.3-fpm service..."
-  sudo service php7.3-fpm stop
-}
-trap cleanup 0
 set -e
 
 if [ "${DB_CONNECTION}" = "sqlite" ]; then
@@ -24,9 +18,6 @@ else
 fi
 ln -sF /2fauth/storage /srv/storage
 
-sudo service php7.3-fpm start
-sudo service php7.3-fpm status
-
 if [ -f /2fauth/installed ]; then
   php artisan migrate
   php artisan config:clear
@@ -40,5 +31,4 @@ else
   echo "do not remove me" > /2fauth/installed
 fi
 
-echo "Nginx listening on :8000"
-nginx
+supervisord
diff --git a/docker/nginx.conf b/docker/nginx.conf
index cfa71f18..6dd1f752 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -1,4 +1,3 @@
-daemon off;
 events {}
 http {
   include mime.types;
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
new file mode 100644
index 00000000..b90aa151
--- /dev/null
+++ b/docker/supervisord.conf
@@ -0,0 +1,19 @@
+[supervisord]
+nodaemon=true
+pidfile=/run/supervisord.pid
+loglevel=info
+
+[program-default]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=false
+startretries=0
+
+[program:php-fpm]
+command=php-fpm7.3 -F
+
+[program:nginx]
+command=nginx -g 'daemon off;'
+depends_on=php-fpm