diff --git a/roles/mail_server/defaults/main.yml b/roles/mail_server/defaults/main.yml
index 6cc11a67b83d83fd2930219dcfa4c63f5ddb1bf8..0eb58f4156dcc830fca83b3a4b5807aab1ce3bc3 100644
--- a/roles/mail_server/defaults/main.yml
+++ b/roles/mail_server/defaults/main.yml
@@ -2,11 +2,11 @@
 
 mail_ldap_tls_truststore: "/etc/ssl/certs/truststore.pem"
 mail_user: vmail
-imap_tls_certificate: "{{ tls_certificate_dir }}/{{ hostvars[host]['fqdn'] }}_imap.pem"
-imap_tls_key: "{{ tls_private_key_dir }}/{{ hostvars[host]['fqdn'] }}_imap.key"
-smtp_tls_certificate: "{{ tls_certificate_dir }}/{{ hostvars[host]['fqdn'] }}_smtp.pem"
-smtp_tls_key: "{{ tls_certificate_dir }}/{{ hostvars[host]['fqdn'] }}_smtp.key"
+imap_tls_certificate: "{{ tls_certificate_dir }}/{{ ansible_fqdn }}_imap.pem"
+imap_tls_key: "{{ tls_private_key_dir }}/{{ ansible_fqdn }}_imap.key"
+smtp_tls_certificate: "{{ tls_certificate_dir }}/{{ ansible_fqdn }}_smtp.pem"
+smtp_tls_key: "{{ tls_certificate_dir }}/{{ ansible_fqdn }}_smtp.key"
 imap_folder_separator: "/"
 smtp_rbl: []
-mail_postmaster: "postmaster@{{ hostvars[host]['domain'] }}"
+mail_postmaster: "postmaster@{{ ansible_domain }}"
 smtp_allow_relay_from: []
\ No newline at end of file