diff --git a/roles/mail_server/templates/main.cf.j2 b/roles/mail_server/templates/main.cf.j2
index 149112a710c7fceb4b441b5628501ccb9e333c70..8a6a8332ea40000eb2ff904a0910fded0ce766c4 100644
--- a/roles/mail_server/templates/main.cf.j2
+++ b/roles/mail_server/templates/main.cf.j2
@@ -52,8 +52,8 @@ smtpd_sasl_auth_enable = no
 # TLS configuration.
 smtpd_tls_security_level = may
 smtpd_tls_auth_only = yes
-smtpd_tls_cert_file = /etc/ssl/certs/{{ smtp_tls_certificate | basename }}
-smtpd_tls_key_file = /etc/ssl/private/{{ smtp_tls_key | basename }}
+smtpd_tls_cert_file = /etc/ssl/certs/{{ ansible_fqdn }}_smtp.pem
+smtpd_tls_key_file = /etc/ssl/private/{{ ansible_fqdn }}_smtp.key
 smtpd_use_tls=yes
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache