diff --git a/Dockerfile b/Dockerfile
index 7a52f78..5d0e4a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -79,7 +79,7 @@ RUN apt-get update \
     && sed -i 's/# server_tokens/server_tokens/' /etc/nginx/nginx.conf
 
 COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf
-COPY conf/supervisord.conf /etc/supervisor/supervisord.conf
+COPY conf/supervisor/*.conf /etc/supervisor/conf.d/
 COPY bin/docker-entrypoint.sh /docker-entrypoint.sh
 
 EXPOSE 80 443
diff --git a/conf/supervisor/cron.conf b/conf/supervisor/cron.conf
new file mode 100644
index 0000000..5b6291f
--- /dev/null
+++ b/conf/supervisor/cron.conf
@@ -0,0 +1,8 @@
+[program:cron]
+command=cron -f -l
+autostart=true
+priority=20
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
diff --git a/conf/supervisor/nginx.conf b/conf/supervisor/nginx.conf
new file mode 100644
index 0000000..09bb111
--- /dev/null
+++ b/conf/supervisor/nginx.conf
@@ -0,0 +1,8 @@
+[program:nginx]
+command=nginx -g "daemon off;"
+autostart=true
+priority=10
+stdout_logfile=/var/log/nginx/access.log
+stdout_logfile_maxbytes=0
+stderr_logfile=/var/log/nginx/error.log
+stderr_logfile_maxbytes=0
diff --git a/conf/supervisor/php.conf b/conf/supervisor/php.conf
new file mode 100644
index 0000000..c008c6b
--- /dev/null
+++ b/conf/supervisor/php.conf
@@ -0,0 +1,8 @@
+[program:php-fpm]
+command=php-fpm -F
+autostart=true
+priority=5
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
diff --git a/conf/supervisord.conf b/conf/supervisord.conf
deleted file mode 100644
index cb90377..0000000
--- a/conf/supervisord.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-; supervisor config file
-
-[unix_http_server]
-file=/var/run/supervisor.sock   ; (the path to the socket file)
-chmod=0700                       ; sockef file mode (default 0700)
-
-[supervisord]
-logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
-pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
-childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
-
-; the below section must remain in the config file for RPC
-; (supervisorctl/web interface) to work, additional interfaces may be
-; added by defining them in separate rpcinterface: sections
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
-
-; The [include] section can just contain the "files" setting.  This
-; setting can list multiple files (separated by whitespace or
-; newlines).  It can also contain wildcards.  The filenames are
-; interpreted as relative to this file.  Included files *cannot*
-; include files themselves.
-
-[program:php-fpm]
-command=php-fpm
-autostart=true
-priority=5
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:nginx]
-command=nginx -g "daemon off;"
-autostart=true
-priority=10
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:cron]
-command=cron -f -l
-autostart=true
-priority=20
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0