diff --git a/data/templates/dovecot/dovecot.conf b/data/templates/dovecot/dovecot.conf
index 6d72e4a73..661aa11cb 100644
--- a/data/templates/dovecot/dovecot.conf
+++ b/data/templates/dovecot/dovecot.conf
@@ -29,10 +29,11 @@ service auth {
 protocol sieve {
 }
 
-ssl_ca = </etc/ssl/certs/ca-yunohost_crt.pem
-ssl_cert = </etc/ssl/certs/yunohost_crt.pem
-ssl_key = </etc/ssl/private/yunohost_key.pem
+ssl_ca = </etc/yunohost/certs/{{ main_domain }}/ca.pem
+ssl_cert = </etc/yunohost/certs/{{ main_domain }}/crt.pem
+ssl_key = </etc/yunohost/certs/{{ main_domain }}/key.pem
 ssl_protocols = !SSLv2 !SSLv3
+
 userdb {
   args = /etc/dovecot/dovecot-ldap.conf
   driver = ldap
diff --git a/data/templates/postfix/main.cf b/data/templates/postfix/main.cf
index 07fc0547b..e0c5cda0a 100644
--- a/data/templates/postfix/main.cf
+++ b/data/templates/postfix/main.cf
@@ -28,9 +28,9 @@ smtpd_tls_security_level=may
 # compatibility with non-TLS clients, the default is to accept AUTH without
 # encryption. In order to change this behavior, we set "smtpd_tls_auth_only = yes".
 smtpd_tls_auth_only=yes
-smtpd_tls_cert_file=/etc/ssl/certs/yunohost_crt.pem
-smtpd_tls_key_file=/etc/ssl/private/yunohost_key.pem
-smtpd_tls_CAfile = /etc/ssl/certs/ca-yunohost_crt.pem
+smtpd_tls_cert_file = /etc/yunohost/certs/{{ main_domain }}/crt.pem
+smtpd_tls_key_file = /etc/yunohost/certs/{{ main_domain }}/key.pem
+smtpd_tls_CAfile = /etc/yunohost/certs/{{ main_domain }}/ca.pem
 smtpd_tls_exclude_ciphers = aNULL, MD5, DES, ADH, RC4, 3DES
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtpd_tls_loglevel=1