diff --git a/php-apache/docker-compose.yml b/php-apache/docker-compose.yml
index 276370d..d164892 100644
--- a/php-apache/docker-compose.yml
+++ b/php-apache/docker-compose.yml
@@ -34,3 +34,48 @@ services:
       - MYSQL_DATABASE=roundcube
       - MYSQL_USER=roundcube
       - MYSQL_PASSWORD=roundcubedbpass
+
+  # Sample mail server to use with RoundCube: https://github.com/tomav/docker-mailserver
+#  mailserver:
+#    image: tvial/docker-mailserver:latest
+#    hostname: mail
+#    domainname: <YOUR.DOMAIN.NAME>
+#    container_name: mail
+#    restart: always
+#    ports:
+#      # receiving email from other mailservers
+#      - "25:25"
+#      # SSL & TLS Client email submission (SMTP)
+#      - "465:465"
+#      - "587:587"
+#      # StartTLS & TLS/SSL IMAP client
+#      - "143:143"
+#      - "993:993"
+#      # POP3 & TLS/SSL POP3 client
+#      - "110:110"
+#      - "995:995"
+#      # Manage Sieve port
+#      - "4190:4190"
+#    environment:
+#      - DMS_DEBUG=0
+#      - ONE_DIR=1
+#      - ENABLE_CLAMAV=1
+#      - ENABLE_FAIL2BAN=1
+#      - ENABLE_POSTGREY=1
+#      - ENABLE_MANAGESIEVE=1
+#      # If you need SSL connection, you can provide your own certificates
+#      #- SSL_TYPE=manual
+#      #- SSL_CERT_PATH=/etc/letsencrypt/fullchain.pem
+#      #- SSL_KEY_PATH=/etc/letsencrypt/privkey.pem
+#    cap_add:
+#      - NET_ADMIN
+#      - SYS_PTRACE
+#    volumes:
+#      - /srv/mail/data:/var/mail
+#      - /srv/mail/state:/var/mail-state
+#      # For proper delivery, generate DKIM keys in /srv/mail/setup
+#      - /srv/mail/setup:/tmp/docker-mailserver
+#      - /etc/localtime:/etc/localtime:ro
+#      - /etc/timezone:/etc/timezone:ro
+#      # If you need SSL connection, you can provide your own certificates
+#      # - ./certs:/etc/letsencrypt
diff --git a/php-fpm/docker-compose.yml b/php-fpm/docker-compose.yml
index e9b084a..dac7526 100644
--- a/php-fpm/docker-compose.yml
+++ b/php-fpm/docker-compose.yml
@@ -55,3 +55,48 @@ services:
     environment:
       - NGINX_HOST=localhost # set your local domain or your live domain
       # - NGINX_CGI=roundcube:9000 # same as roundcube container name
+
+  # Sample mail server to use with RoundCube: https://github.com/tomav/docker-mailserver
+#  mailserver:
+#    image: tvial/docker-mailserver:latest
+#    hostname: mail
+#    domainname: <YOUR.DOMAIN.NAME>
+#    container_name: mail
+#    restart: always
+#    ports:
+#      # receiving email from other mailservers
+#      - "25:25"
+#      # SSL & TLS Client email submission (SMTP)
+#      - "465:465"
+#      - "587:587"
+#      # StartTLS & TLS/SSL IMAP client
+#      - "143:143"
+#      - "993:993"
+#      # POP3 & TLS/SSL POP3 client
+#      - "110:110"
+#      - "995:995"
+#      # Manage Sieve port
+#      - "4190:4190"
+#    environment:
+#      - DMS_DEBUG=0
+#      - ONE_DIR=1
+#      - ENABLE_CLAMAV=1
+#      - ENABLE_FAIL2BAN=1
+#      - ENABLE_POSTGREY=1
+#      - ENABLE_MANAGESIEVE=1
+#      # If you need SSL connection, you can provide your own certificates
+#      #- SSL_TYPE=manual
+#      #- SSL_CERT_PATH=/etc/letsencrypt/fullchain.pem
+#      #- SSL_KEY_PATH=/etc/letsencrypt/privkey.pem
+#    cap_add:
+#      - NET_ADMIN
+#      - SYS_PTRACE
+#    volumes:
+#      - /srv/mail/data:/var/mail
+#      - /srv/mail/state:/var/mail-state
+#      # For proper delivery, generate DKIM keys in /srv/mail/setup
+#      - /srv/mail/setup:/tmp/docker-mailserver
+#      - /etc/localtime:/etc/localtime:ro
+#      - /etc/timezone:/etc/timezone:ro
+#      # If you need SSL connection, you can provide your own certificates
+#      # - ./certs:/etc/letsencrypt