diff --git a/docker-compose.yaml b/docker-compose.yaml
index fffce5d0e1..2e930e4fa6 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -82,25 +82,29 @@ services:
     restart: always
     tty: false
     ports:
-      - 6379:6379
+      - 6379:6379    
   
   mail:
-    build: docker/php
-    restart: always
-    tty: true
-    ports:
-      - "25:25"
-      - "143:143"
-      - "587:587"
-      - "993:993"
+    build: docker/mail
     environment:
-      - DOMAINNAME=mail.test
-      - HOSTNAME=mail
-      - POSTMASTER=postmaster@mail.test
-      - SSL_CERT=/etc/dovecot/ssl/mailserver.crt
-      - SSL_KEY=/etc/dovecot/ssl/mailserver.key
-    
-    
-  
+      DOMAINNAME: mail.test
+      MAILNAME: mail.mail.test            
+      POSTMASTER: postmaster@mail.test
+    env_file:
+      - ./docker/bootstrap/bootstrap.env
+    ports:
+      - 25:25
+      - 143:143
+      - 587:587
+      - 993:993
+    volumes:
+      - maildata:/var/mail
+      - mailconf:/etc/mail
+      # Certbot
+      - ./docker/certbot/www:/var/www/certbot
+      - ./docker/certbot/.files:/etc/letsencrypt
+
 volumes:
   database:
+  maildata:
+  mailconf:
diff --git a/docker/mail/Dockerfile b/docker/mail/Dockerfile
index 1188019368..19b24084be 100644
--- a/docker/mail/Dockerfile
+++ b/docker/mail/Dockerfile
@@ -5,8 +5,8 @@ ENV \
 	DOMAINNAME=example.com \
 	MAILNAME=mail \
 	POSTMASTER=postmaster@example.com \
-	SSL_CERT=/etc/ssl/mailserver.crt \
-	SSL_KEY=/etc/ssl/mailserver.key
+	SSL_CERT=/etc/ssl/cert.pem \
+	SSL_KEY=/etc/ssl/key.pem
 
 # Install packages
 RUN \
diff --git a/docker/mail/docker-compose.yml b/docker/mail/docker-compose.yml
deleted file mode 100644
index 62b775db73..0000000000
--- a/docker/mail/docker-compose.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-version: '3.8'
-
-services:
-    mail:
-        image: mail
-        build: .
-        environment:
-            DOMAINNAME: mail.test
-            MAILNAME: mail.mail.test            
-            POSTMASTER: postmaster@mail.test
-            SSL_CERT: /etc/ssl/mailserver.crt
-            SSL_KEY: /etc/ssl/mailserver.key
-        container_name: mail
-        privileged: true
-        ports:
-          - "25:25"
-          - "143:143"
-          - "587:587"
-          - "993:993"
-        volumes:
-          - maildata:/var/mail
-          - mailconf:/etc/mail
-        
-
-volumes:
-  maildata:
-  mailconf:
-        
\ 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 26c388ca8b..2802c64518 100644
--- a/docker/mail/rootfs/usr/bin/start.sh
+++ b/docker/mail/rootfs/usr/bin/start.sh
@@ -1,14 +1,17 @@
 #!/bin/sh
 
+CERTBOT="/etc/letsencrypt/live/$domain/fullchain.pem"
+KEYBOT="/etc/letsencrypt/live/$domain/privkey.pem"
+
 # Config postfix
 postconf -e myhostname="$MAILNAME"
 postconf -e mydomain="$DOMAINNAME"
-postconf -e smtpd_tls_cert_file="$SSL_CERT"
-postconf -e smtpd_tls_key_file="$SSL_KEY"
+postconf -e smtpd_tls_cert_file="$CERTBOT"
+postconf -e smtpd_tls_key_file="$KEYBOT"
 
 # Config dovecot
-sed -i -e "s#^\s*ssl_cert\s*=.*#ssl_cert = $SSL_CERT#" /etc/dovecot/dovecot.conf
-sed -i -e "s#^\s*ssl_key\s*=.*#ssl_key = $SSL_KEY#" /etc/dovecot/dovecot.conf
+sed -i -e "s#^\s*ssl_cert\s*=.*#ssl_cert = <$CERTBOT#" /etc/dovecot/dovecot.conf
+sed -i -e "s#^\s*ssl_key\s*=.*#ssl_key = <$KEYBOT#" /etc/dovecot/dovecot.conf
 sed -i -e "s#^\s*hostname\s*=.*#hostname = $MAILNAME#" /etc/dovecot/dovecot.conf
 sed -i -e "s#^\s*postmaster_address\s*=.*#postmaster_address = $POSTMASTER#" /etc/dovecot/dovecot.conf
 
@@ -16,15 +19,14 @@ sed -i -e "s#^\s*postmaster_address\s*=.*#postmaster_address = $POSTMASTER#" /et
 sed -i -e "s/#HOSTNAME/$MAILNAME/" /etc/opendkim/TrustedHosts
 
 # Run openssl
-if [ ! -e /etc/ssl/.ssl-generated ]
+if [ $signed -eq 0 ]
 then
-	openssl genrsa -des3 -passout pass:asdf -out /etc/ssl/mail.pass.key 2048 && \
-	openssl rsa -passin pass:asdf -in /etc/ssl/mail.pass.key -out "$SSL_KEY"
-	rm /etc/ssl/mail.pass.key
-	openssl req -new -key "$SSL_KEY" -out /etc/ssl/mail.csr \
-	  -subj "/C=UK/ST=England/L=London/O=OrgName/OU=IT Department/CN=$MAILNAME"
-	openssl x509 -req -days 365 -in /etc/ssl/mail.csr -signkey "$SSL_KEY" -out "$SSL_CERT"
-	echo "Do not remove this file." >> /etc/ssl/.ssl-generated
+	openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout "$SSL_KEY" -out "$SSL_CERT" \
+		-subj "/C=UK/ST=England/L=London/O=OrgName/OU=IT Department/CN=$MAILNAME"
+	postconf -e smtpd_tls_cert_file="$SSL_CERT"
+	postconf -e smtpd_tls_key_file="$SSL_KEY"
+	sed -i -e "s#^\s*ssl_cert\s*=.*#ssl_cert = <$SSL_CERT#" /etc/dovecot/dovecot.conf
+	sed -i -e "s#^\s*ssl_key\s*=.*#ssl_key = <$SSL_KEY#" /etc/dovecot/dovecot.conf
 fi
 
 # Run opendkim