diff --git a/src/mailserver/Containerfile b/src/mailsrv/Containerfile
similarity index 91%
rename from src/mailserver/Containerfile
rename to src/mailsrv/Containerfile
index 626b541..4ee9a5d 100644
--- a/src/mailserver/Containerfile
+++ b/src/mailsrv/Containerfile
@@ -10,9 +10,9 @@ LABEL deployopts="\
 -p 465:465 \
 -p 143:143 \
 -p 993:993 \
--v /srv/volumes/mailserver/db:/vol/db \
--v /srv/volumes/mailserver/mail:/vol/mail \
--v /etc/letsencrypt:/vol/ssl:ro"
+-v /srv/volumes/mailsrv/db:/vol/db \
+-v /srv/volumes/mailsrv/mail:/vol/mail \
+-v /srv/volumes/mailsrv/ssl:/vol/ssl:ro"
 
 # Build Variables
 # uid that the files owner user should have
diff --git a/src/mailserver/assets/bin/mkvirtual b/src/mailsrv/assets/bin/mkvirtual
similarity index 100%
rename from src/mailserver/assets/bin/mkvirtual
rename to src/mailsrv/assets/bin/mkvirtual
diff --git a/src/mailserver/assets/dovecot.conf b/src/mailsrv/assets/dovecot.conf
similarity index 100%
rename from src/mailserver/assets/dovecot.conf
rename to src/mailsrv/assets/dovecot.conf
diff --git a/src/mailserver/assets/dovecot.conf.d/10-auth.conf b/src/mailsrv/assets/dovecot.conf.d/10-auth.conf
similarity index 100%
rename from src/mailserver/assets/dovecot.conf.d/10-auth.conf
rename to src/mailsrv/assets/dovecot.conf.d/10-auth.conf
diff --git a/src/mailserver/assets/dovecot.conf.d/10-mail.conf b/src/mailsrv/assets/dovecot.conf.d/10-mail.conf
similarity index 100%
rename from src/mailserver/assets/dovecot.conf.d/10-mail.conf
rename to src/mailsrv/assets/dovecot.conf.d/10-mail.conf
diff --git a/src/mailserver/assets/dovecot.conf.d/10-master.conf b/src/mailsrv/assets/dovecot.conf.d/10-master.conf
similarity index 100%
rename from src/mailserver/assets/dovecot.conf.d/10-master.conf
rename to src/mailsrv/assets/dovecot.conf.d/10-master.conf
diff --git a/src/mailserver/assets/dovecot.conf.d/10-ssl.conf b/src/mailsrv/assets/dovecot.conf.d/10-ssl.conf
similarity index 96%
rename from src/mailserver/assets/dovecot.conf.d/10-ssl.conf
rename to src/mailsrv/assets/dovecot.conf.d/10-ssl.conf
index 26df27f..8e4da70 100644
--- a/src/mailserver/assets/dovecot.conf.d/10-ssl.conf
+++ b/src/mailsrv/assets/dovecot.conf.d/10-ssl.conf
@@ -9,8 +9,8 @@ ssl = yes
 # dropping root privileges, so keep the key file unreadable by anyone but
 # root. Included doc/mkcert.sh can be used to easily generate self-signed
 # certificate, just make sure to update the domains in dovecot-openssl.cnf
-ssl_cert = </etc/ssl/$myhostname/fullchain.pem
-ssl_key = </etc/ssl/$myhostname/privkey.pem
+ssl_cert = </vol/ssl/mailtest.brbytes.org/fullchain.pem
+ssl_key = </vol/ssl/mailtest.brbytes.org/privkey.pem
 
 # If key file is password protected, give the password here. Alternatively
 # give it when starting dovecot with -p parameter. Since this file is often
diff --git a/src/mailserver/assets/dovecot.conf.d/15-mailboxes.conf b/src/mailsrv/assets/dovecot.conf.d/15-mailboxes.conf
similarity index 100%
rename from src/mailserver/assets/dovecot.conf.d/15-mailboxes.conf
rename to src/mailsrv/assets/dovecot.conf.d/15-mailboxes.conf
diff --git a/src/mailserver/assets/dovecot.conf.d/20-lmtp.conf b/src/mailsrv/assets/dovecot.conf.d/20-lmtp.conf
similarity index 100%
rename from src/mailserver/assets/dovecot.conf.d/20-lmtp.conf
rename to src/mailsrv/assets/dovecot.conf.d/20-lmtp.conf
diff --git a/src/mailserver/assets/main.cf b/src/mailsrv/assets/main.cf
similarity index 95%
rename from src/mailserver/assets/main.cf
rename to src/mailsrv/assets/main.cf
index 68ebd86..65c2533 100644
--- a/src/mailserver/assets/main.cf
+++ b/src/mailsrv/assets/main.cf
@@ -27,8 +27,8 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 # whether to allow or enforce TLS. Acceptable values are 'none', 'may', or 'encrypt'.
 smtpd_tls_security_level=may
 # where to find certs
-smtpd_tls_cert_file=/etc/ssl/$myhostname/fullchain.pem
-smtpd_tls_key_file=/etc/ssl/$myhostname/privkey.pem
+smtpd_tls_cert_file=/vol/ssl/mailtest.brbytes.org/fullchain.pem
+smtpd_tls_key_file=/vol/ssl/mailtest.brbytes.org/privkey.pem
 
 # SASL (user authentication) settings
 smtpd_sasl_type = dovecot
diff --git a/src/mailserver/assets/postfix.service.override b/src/mailsrv/assets/postfix.service.override
similarity index 100%
rename from src/mailserver/assets/postfix.service.override
rename to src/mailsrv/assets/postfix.service.override
diff --git a/src/mailserver/docs/Build.md b/src/mailsrv/docs/Build.md
similarity index 100%
rename from src/mailserver/docs/Build.md
rename to src/mailsrv/docs/Build.md
diff --git a/src/mailserver/docs/Deploy.md b/src/mailsrv/docs/Deploy.md
similarity index 100%
rename from src/mailserver/docs/Deploy.md
rename to src/mailsrv/docs/Deploy.md