diff --git a/roles/mail_server/templates/99-local.conf.j2 b/roles/mail_server/templates/99-local.conf.j2
index bc937a2212a174973e9c93044ca0c351a2c0d689..b11d31bd3d2fc08c3ebea6f54aab71d476e3b618 100644
--- a/roles/mail_server/templates/99-local.conf.j2
+++ b/roles/mail_server/templates/99-local.conf.j2
@@ -29,8 +29,8 @@ service auth {
 }
 
 # TLS configuration.
-ssl_cert = </etc/ssl/certs/{{ imap_tls_certificate | basename }}
-ssl_key = </etc/ssl/private/{{ imap_tls_key | basename }}
+ssl_cert = </etc/ssl/certs/{{ ansible_fqdn }}_imap.pem
+ssl_key = </etc/ssl/private/{{ ansible_fqdn }}_imap.key
 ssl_protocols = TLSv1.2
 ssl_cipher_list = DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:!aNULL:!MD5:!EXPORT
 ssl = required