diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml
index 65e52744b012ff0e9a2f3a13a0c14adf59ca016e..dcd2057dc04d6e5fac23937c6e83fb39ff4af320 100644
--- a/roles/xmpp_server/tasks/main.yml
+++ b/roles/xmpp_server/tasks/main.yml
@@ -24,13 +24,13 @@
   user: name=prosody append=yes groups=ssl-cert
 
 - name: Deploy XMPP TLS private key
-  copy: dest="/etc/ssl/private/{{ xmpp_tls_key | basename }}" src="{{ xmpp_tls_key }}"
+  copy: dest="/etc/ssl/private/{{ ansible_fqdn }}_xmpp.key" content="{{ xmpp_tls_key }}"
         mode=640 owner=root group=prosody
   notify:
     - Restart Prosody
 
 - name: Deploy XMPP TLS certificate
-  copy: dest="/etc/ssl/certs/{{ xmpp_tls_certificate | basename }}" src="{{ xmpp_tls_certificate }}"
+  copy: dest="/etc/ssl/certs/{{ ansible_fqdn }}_xmpp.pem" content="{{ xmpp_tls_certificate }}"
         mode=644 owner=root group=root
   notify:
     - Restart Prosody