diff --git a/testsite/group_vars/xmpp.yml b/testsite/group_vars/xmpp.yml
index 139f30977db7bd7271464af4c9df3539b1b8eb22..cbb87bc66511704a3c82f53be9c9d7ec853fb99d 100644
--- a/testsite/group_vars/xmpp.yml
+++ b/testsite/group_vars/xmpp.yml
@@ -21,26 +21,26 @@ smtp_relay_host: mail.{{ testsite_domain }}
 
 smtp_relay_truststore: /etc/ssl/certs/ca.pem
 
-prosody_administrators:
+xmpp_administrators:
   - john.doe@{{ testsite_domain }}
 
-prosody_tls_key: "{{ inventory_dir }}/tls/xmpp.{{ testsite_domain }}_xmpp.key"
+xmpp_tls_key: "{{ inventory_dir }}/tls/xmpp.{{ testsite_domain }}_xmpp.key"
 
-prosody_tls_certificate: "{{ inventory_dir }}/tls/xmpp.{{ testsite_domain }}_xmpp.pem"
+xmpp_tls_certificate: "{{ inventory_dir }}/tls/xmpp.{{ testsite_domain }}_xmpp.pem"
 
-prosody_domains:
+xmpp_domains:
   - "{{ testsite_domain }}"
 
-prosody_ldap_server: ldap.{{ testsite_domain }}
+xmpp_ldap_server: ldap.{{ testsite_domain }}
 
-prosody_ldap_bind_dn: cn=xmpp,ou=services,{{ testsite_ldap_base }}
+xmpp_ldap_bind_dn: cn=xmpp,ou=services,{{ testsite_ldap_base }}
 
-prosody_ldap_password: xmpp
+xmpp_ldap_password: xmpp
 
-prosody_ldap_filter: '(&(memberOf=cn=xmpp,ou=groups,{{ testsite_ldap_base }})(mail=$user@$host))'
+xmpp_ldap_filter: '(&(memberOf=cn=xmpp,ou=groups,{{ testsite_ldap_base }})(mail=$user@$host))'
 
-prosody_ldap_scope: "onelevel"
+xmpp_ldap_scope: "onelevel"
 
-prosody_ldap_tls: "true"
+xmpp_ldap_tls: "true"
 
-prosody_ldap_base: "ou=people,{{ testsite_ldap_base }}"
+xmpp_ldap_base: "ou=people,{{ testsite_ldap_base }}"