diff --git a/roles/prosody/templates/prosody.cfg.lua.j2 b/roles/prosody/templates/prosody.cfg.lua.j2
index aa6f38ecfa68f0c7b51d53cac85654fff30ee8c5..f5851d37f5eeef538e4cd9e0edd372b42d9d2e5f 100644
--- a/roles/prosody/templates/prosody.cfg.lua.j2
+++ b/roles/prosody/templates/prosody.cfg.lua.j2
@@ -69,18 +69,17 @@ storage = "internal"
 
 -- Logging configuration.
 log = {
-  debug = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+  info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
   error = "/var/log/prosody/prosody.err";
   "*syslog";
 }
 
--- Domains which should be handled by Prosody.
+-- Domains which should be handled by Prosody, with dedicated MUC and file
+-- proxying components.
 {% for domain in prosody_domains -%}
 VirtualHost "{{ domain }}"
+Component "conference.{{ domain }}" "muc"
+  restrict_room_creation = "local"
+Component "proxy.{{ domain }}" "proxy65"
+  proxy65_acl = { "{{ domain }}" }
 {% endfor -%}
-
--- Support for multi-user chats.
-Component "{{ prosody_conference_fqdn }}" "muc"
-
--- Support for server-proxied file transfers.
-Component "{{ prosody_proxy_fqdn }}" "proxy65"
diff --git a/testsite/group_vars/xmpp.yml b/testsite/group_vars/xmpp.yml
index 0ffc346631d4b32cc5b6322ccb0d46d5c0233e7e..82e70997c868a68c877ad9317557da4b4da4773f 100644
--- a/testsite/group_vars/xmpp.yml
+++ b/testsite/group_vars/xmpp.yml
@@ -10,10 +10,6 @@ prosody_tls_certificate: /etc/prosody/certs/localhost.crt
 prosody_domains:
   - example.com
 
-prosody_conference_fqdn: conference.example.com
-
-prosody_proxy_fqdn: proxy.example.com
-
 prosody_ldap_server: ldap.example.com
 
 prosody_ldap_bind_dn: cn=xmpp,ou=services,dc=example,dc=com