diff --git a/docker-compose.yaml b/docker-compose.yaml
index cfa69fce01..e1eb94fee7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -90,6 +90,7 @@ services:
       - ./docker/mail/mail.env
     ports:
       - 25:25
+      - 110:110
       - 143:143
       - 587:587
       - 993:993
diff --git a/docker/mail/.gitignore b/docker/mail/.gitignore
new file mode 100644
index 0000000000..e78d74c1ac
--- /dev/null
+++ b/docker/mail/.gitignore
@@ -0,0 +1,2 @@
+mail.env
+config/*
diff --git a/docker/mail/Dockerfile b/docker/mail/Dockerfile
index 33d277fdf6..0f01cf2e23 100644
--- a/docker/mail/Dockerfile
+++ b/docker/mail/Dockerfile
@@ -15,9 +15,9 @@ RUN \
 		opendkim-tools \
 		openssl \
 		postfix \
+		procps \
 		rsyslog \
-		supervisor \
-		telnet \
+		s6 \
 	&& apt-get autoclean \
 	&& apt-get autoremove
 
@@ -35,8 +35,18 @@ RUN \
 # Copy config files
 COPY rootfs/ /
 
+RUN \
+	touch /etc/mail/aliases /etc/mail/domains /etc/mail/mailboxes /etc/mail/passwd \
+	&& postmap /etc/mail/aliases && postmap /etc/mail/domains && postmap /etc/mail/mailboxes
+
+RUN \
+	chmod +x /etc/service/postfix/run \
+	&& chmod +x /etc/service/dovecot/run \
+	&& chmod +x /etc/service/opendkim/run \
+	&& chmod +x /etc/service/rsyslog/run
+
 # Expose ports
-EXPOSE 110 143 587 993 995
+EXPOSE 25 110 143 587 993 995
 
 # Run start script
 ENTRYPOINT /usr/bin/start.sh
diff --git a/docker/mail/README b/docker/mail/README
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docker/mail/config/aliases.db b/docker/mail/config/aliases.db
deleted file mode 100644
index 62cb558be9..0000000000
Binary files a/docker/mail/config/aliases.db and /dev/null differ
diff --git a/docker/mail/config/domains.db b/docker/mail/config/domains.db
deleted file mode 100644
index f3a38bdd85..0000000000
Binary files a/docker/mail/config/domains.db and /dev/null differ
diff --git a/docker/mail/config/dovecot/dovecot.conf b/docker/mail/config/dovecot/dovecot.conf
index 3f0e885653..5506d33845 100644
--- a/docker/mail/config/dovecot/dovecot.conf
+++ b/docker/mail/config/dovecot/dovecot.conf
@@ -1,8 +1,8 @@
 protocols = imap pop3 lmtp
 
 ssl = yes
-ssl_cert = </etc/letsencrypt/live/social.org/fullchain.pem
-ssl_key = </etc/letsencrypt/live/social.org/privkey.pem
+ssl_cert = 
+ssl_key = 
 ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL
 
 listen = *, ::
diff --git a/docker/mail/config/opendkim/TrustedHosts b/docker/mail/config/opendkim/TrustedHosts
index ba67fe9b28..ef33e72865 100644
--- a/docker/mail/config/opendkim/TrustedHosts
+++ b/docker/mail/config/opendkim/TrustedHosts
@@ -7,7 +7,5 @@
 ::1
 172.17.0.0/16
 fe80::/64
-social.org
+#HOSTNAME
 
-#host.example.com
-#192.168.1.0/24
diff --git a/docker/mail/config/postfix/main.cf b/docker/mail/config/postfix/main.cf
index f6951ddd05..32cbcc7056 100644
--- a/docker/mail/config/postfix/main.cf
+++ b/docker/mail/config/postfix/main.cf
@@ -5,8 +5,8 @@ command_directory = /usr/sbin
 daemon_directory = /usr/lib/postfix/sbin
 data_directory = /var/lib/postfix
 mail_owner = postfix
-myhostname = %MAIL_HOSTNAME%
-mydomain = %MAIL_HOSTNAME_FQDN%
+myhostname = 
+mydomain = 
 myorigin = $myhostname
 inet_interfaces = all
 inet_protocols = all
@@ -63,8 +63,8 @@ smtpd_sasl_local_domain = $mydomain
 broken_sasl_auth_clients = yes
 
 smtpd_tls_security_level = may
-smtpd_tls_key_file = /etc/ssl/mail.key
-smtpd_tls_cert_file = /etc/ssl/mail.crt
+smtpd_tls_key_file = 
+smtpd_tls_cert_file = 
 smtpd_tls_loglevel = 1
 smtpd_tls_session_cache_timeout = 3600s
 smtpd_tls_session_cache_database = btree:/var/lib/postfix/smtpd_tls_cache
diff --git a/docker/mail/rootfs/etc/mail/supervisord/supervisord.conf b/docker/mail/rootfs/etc/mail/supervisord/supervisord.conf
deleted file mode 100644
index e4501f8693..0000000000
--- a/docker/mail/rootfs/etc/mail/supervisord/supervisord.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-[unix_http_server]
-file=/tmp/supervisor.sock
-
-[supervisord]
-nodaemon=true
-user=root
-loglevel=warn
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisor.sock
-user=root
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[program:opendkim]
-autostart=false
-autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-command=/usr/sbin/opendkim -x /etc/mail/opendkim/opendkim.conf
-
-[program:postfix]
-autostart=false
-autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-command=postfix -c /etc/mail/postfix/postfix.conf
-
-[program:dovecot]
-autostart=false
-autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-command=dovecot -c /etc/mail/dovecot/dovecot.conf
-
-[program:rsyslog]
-autostart=false
-autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-command=rsyslog -f /etc/mail/rsyslogd/rsyslog.conf
diff --git a/docker/mail/rootfs/etc/service/dovecot/run b/docker/mail/rootfs/etc/service/dovecot/run
new file mode 100644
index 0000000000..3d220e6542
--- /dev/null
+++ b/docker/mail/rootfs/etc/service/dovecot/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+PID=$(pgrep dovecot)
+if [ -z $PID ]
+then
+    exec /usr/sbin/dovecot -c /etc/mail/dovecot/dovecot.conf
+fi
diff --git a/docker/mail/rootfs/etc/service/opendkim/run b/docker/mail/rootfs/etc/service/opendkim/run
new file mode 100644
index 0000000000..aee7d8d0e9
--- /dev/null
+++ b/docker/mail/rootfs/etc/service/opendkim/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+PID=$(pgrep opendkim)
+if [ -z $PID ]
+then
+    exec /usr/sbin/opendkim -x /etc/mail/opendkim/opendkim.conf
+fi
\ No newline at end of file
diff --git a/docker/mail/rootfs/etc/service/postfix/run b/docker/mail/rootfs/etc/service/postfix/run
new file mode 100644
index 0000000000..0649859356
--- /dev/null
+++ b/docker/mail/rootfs/etc/service/postfix/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+PID=$(pgrep master)
+if [ -z $PID ]
+then
+    exec /usr/sbin/postfix start -c /etc/mail/postfix
+fi
\ No newline at end of file
diff --git a/docker/mail/rootfs/etc/service/rsyslog/run b/docker/mail/rootfs/etc/service/rsyslog/run
new file mode 100644
index 0000000000..3c3021fcfc
--- /dev/null
+++ b/docker/mail/rootfs/etc/service/rsyslog/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+PID=$(pgrep rsyslog)
+if [ -z $PID ]
+then
+    exec /usr/sbin/rsyslogd -f /etc/mail/rsyslogd/rsyslog.conf
+fi
\ No newline at end of file
diff --git a/docker/mail/rootfs/usr/bin/start.sh b/docker/mail/rootfs/usr/bin/start.sh
index 2674d6588a..3dac6f4baa 100644
--- a/docker/mail/rootfs/usr/bin/start.sh
+++ b/docker/mail/rootfs/usr/bin/start.sh
@@ -17,15 +17,8 @@ fi
 # Prepare postfix
 if [ ! -d "/var/mail/$DOMAINNAME" ]
 then
-	touch /etc/mail/aliases /etc/mail/domains /etc/mail/mailboxes /etc/mail/passwd
-	postmap /etc/mail/aliases && postmap /etc/mail/domains && postmap /etc/mail/mailboxes
 	/usr/bin/new-domain.sh "$DOMAINNAME"
 fi
 
-
-# Start services
-rsyslogd 				-f /etc/mail/rsyslogd/rsyslog.conf
-/usr/sbin/opendkim 		-x /etc/mail/opendkim/opendkim.conf
-/usr/sbin/dovecot 		-c /etc/mail/dovecot/dovecot.conf
-/usr/sbin/postfix start	-c /etc/mail/postfix
-supervisord 			-c /etc/mail/supervisord/supervisord.conf
+# Run services
+s6-svscan /etc/service
diff --git a/docker/mail/setup.sh b/docker/mail/setup.sh
index 7d8c8c1e25..4d38c9b5ad 100644
--- a/docker/mail/setup.sh
+++ b/docker/mail/setup.sh
@@ -12,7 +12,7 @@ else
   domain="${sub_domain}.${domain_root}"
 fi
 
-cat > mail.env <<EOF
+cat > ./docker/mail/mail.env <<EOF
 #!/bin/sh
 DOMAINNAME=${domain_root}
 MAILNAME=${domain}
@@ -20,18 +20,24 @@ SSL_CERT=/etc/letsencrypt/live/${domain_root}/fullchain.pem
 SSL_KEY=/etc/letsencrypt/live/${domain_root}/privkey.pem
 EOF
 
+DOMAINNAME="${domain_root}"
+MAILNAME="${domain}"
+SSL_CERT="/etc/letsencrypt/live/${domain_root}/fullchain.pem"
+SSL_KEY="/etc/letsencrypt/live/${domain_root}/privkey.pem"
 
 # Config postfix
-sed -i -e "s#^\s*myhostname\s*=.*#myhostname = $MAILNAME#" rootfs/etc/mail/postfix/main.cf
-sed -i -e "s#^\s*mydomain\s*=.*#mydomain = $DOMAINNAME#" rootfs/etc/mail/postfix/main.cf
-sed -i -e "s#^\s*smtpd_tls_cert_file\s*=.*#smtpd_tls_cert_file = $SSL_CERT#" rootfs/etc/mail/postfix/main.cf
-sed -i -e "s#^\s*smtpd_tls_key_file\s*=.*#smtpd_tls_key_file = $SSL_KEY#" rootfs/etc/mail/postfix/main.cf
+sed -i -e "s#^\s*myhostname\s*=.*#myhostname = $MAILNAME#" ./docker/mail/config/postfix/main.cf
+sed -i -e "s#^\s*mydomain\s*=.*#mydomain = $DOMAINNAME#" ./docker/mail/config/postfix/main.cf
+sed -i -e "s#^\s*smtpd_tls_cert_file\s*=.*#smtpd_tls_cert_file = $SSL_CERT#" ./docker/mail/config/postfix/main.cf
+sed -i -e "s#^\s*smtpd_tls_key_file\s*=.*#smtpd_tls_key_file = $SSL_KEY#" ./docker/mail/config/postfix/main.cf
 
 # Config dovecot
-sed -i -e "s#^\s*ssl_cert\s*=.*#ssl_cert = <$SSL_CERT#" rootfs/etc/mail/dovecot/dovecot.conf
-sed -i -e "s#^\s*ssl_key\s*=.*#ssl_key = <$SSL_KEY#" rootfs/etc/mail/dovecot/dovecot.conf
-sed -i -e "s#^\s*hostname\s*=.*#hostname = $MAILNAME#" rootfs/etc/mail/dovecot/dovecot.conf
-sed -i -e "s#^\s*postmaster_address\s*=.*#postmaster_address = $POSTMASTER#" rootfs/etc/mail/dovecot/dovecot.conf
+sed -i -e "s#^\s*ssl_cert\s*=.*#ssl_cert = <$SSL_CERT#" ./docker/mail/config/dovecot/dovecot.conf
+sed -i -e "s#^\s*ssl_key\s*=.*#ssl_key = <$SSL_KEY#" ./docker/mail/config/dovecot/dovecot.conf
+sed -i -e "s#^\s*postmaster_address\s*=.*#postmaster_address = postmaster@$DOMAINNAME#" ./docker/mail/config/dovecot/dovecot.conf
 
 # Config dkim
-sed -i -e "s/#HOSTNAME/$MAILNAME/" rootfs/etc/mail/opendkim/TrustedHosts
+sed -i -e "s/^.*#HOSTNAME/$MAILNAME#HOSTNAME/" ./docker/mail/config/opendkim/TrustedHosts
+
+# Prepare mail user
+touch /etc/mail/aliases /etc/mail/domains /etc/mail/mailboxes /etc/mail/passwd