diff --git a/roles/mail_server/tasks/main.yml b/roles/mail_server/tasks/main.yml
index a4f4fb2b9a80c0e2c0a094079edebc2160c09ed6..9a830e9e761c2c2286678d6fdf2f07c97bcb925c 100644
--- a/roles/mail_server/tasks/main.yml
+++ b/roles/mail_server/tasks/main.yml
@@ -27,25 +27,25 @@
   user: name=dovecot append=yes groups=ssl-cert
 
 - name: Deploy SMTP TLS private key
-  copy: dest="/etc/ssl/private/{{ smtp_tls_key | basename }}" src="{{ smtp_tls_key }}"
+  copy: dest="/etc/ssl/private/{{ ansible_fqdn }}_smtp.key" content="{{ smtp_tls_key }}"
         mode=640 owner=root group=root
   notify:
     - Restart Postfix
 
 - name: Deploy SMTP TLS certificate
-  copy: dest="/etc/ssl/certs/{{ smtp_tls_certificate | basename }}" src="{{ smtp_tls_certificate }}"
+  copy: dest="/etc/ssl/certs/{{ ansible_fqdn }}_smtp.pem" content="{{ smtp_tls_certificate }}"
         mode=644 owner=root group=root
   notify:
     - Restart Postfix
 
 - name: Deploy IMAP TLS private key
-  copy: dest="/etc/ssl/private/{{ imap_tls_key | basename }}" src="{{ imap_tls_key }}"
+  copy: dest="/etc/ssl/private/{{ ansible_fqdn }}_imap.key" content="{{ imap_tls_key }}"
         mode=640 owner=root group=root
   notify:
     - Restart Dovecot
 
 - name: Deploy IMAP TLS certificate
-  copy: dest="/etc/ssl/certs/{{ imap_tls_certificate | basename }}" src="{{ imap_tls_certificate }}"
+  copy: dest="/etc/ssl/certs/{{ ansible_fqdn }}_imap.pem" content="{{ imap_tls_certificate }}"
         mode=644 owner=root group=root
   notify:
     - Restart Dovecot