diff --git a/roles/prosody/templates/prosody.cfg.lua.j2 b/roles/prosody/templates/prosody.cfg.lua.j2
index 5bbb850a62b444ebb9081bd8e96d2eee71ed6404..ba0abbcac42517ac7db80f19cac2c6a9ad896e23 100644
--- a/roles/prosody/templates/prosody.cfg.lua.j2
+++ b/roles/prosody/templates/prosody.cfg.lua.j2
@@ -49,7 +49,7 @@ modules_enabled = {
             "announce"; -- Send announcement to all online users
             --"motd"; -- Send a message to users when they log in
             --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-            "proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
+            --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
             "cloud_notify"; -- Enable push messaging
             "smacks"; -- Enable XEP-0198: Stream Management
             "privacy_lists"; -- Enable XEP-0016: Privacy Lists
@@ -73,8 +73,12 @@ statistics_interval = "manual"
 -- This is needed to allow external services to query the openmetrics endpoint
 openmetrics_allow_cidr = "0.0.0.0/0"
 
+-- Registration of users is managed through services.a.o
 allow_registration = false
+
+-- mam
 archive_expires_after = "1w"
+default_archive_policy = true
 
 -- Standard ports
 c2s_ports = {5222}
@@ -117,7 +121,12 @@ auth_custom_http = {
   post_url = "http://127.0.0.1:4041/";
 }
 
-storage = "sql"
+-- storage
+default_storage = "sql"
+-- for privacy reasons, disable sql storage for mam archive
+storage = {
+  archive = "memory";
+}
 sql = {
     driver = "MySQL",
     database = "ai_prosody",
@@ -134,6 +143,9 @@ VirtualHost "{{ domain }}"
     key = "/etc/credentials/public/{{ domain }}/privkey.pem";
     certificate = "/etc/credentials/public/{{ domain }}/fullchain.pem";
   }
+  disco_items = {
+    { "conference.jabber.{{ domain }}", "Conference rooms for {{ domain }}" };
+  }
 
 Component "conference.jabber.{{ domain }}" "muc"
   name = "Conference rooms for {{ domain }}"
@@ -153,9 +165,6 @@ Component "conference.jabber.{{ domain }}" "muc"
   muc_log_presences = false;
   muc_log_expires_after = "1w";
 
-
-Component "proxy.jabber.{{ domain }}" "proxy65"
-
 {% endfor %}
 
--- vim:set syntax=lua:
+-- vim:set syntax=lua et ts=2 sts=0 sw=0: