diff --git a/roles/prosody/defaults/main.yml b/roles/prosody/defaults/main.yml
index bbadc9c..b642916 100644
--- a/roles/prosody/defaults/main.yml
+++ b/roles/prosody/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 prosody_domain: "jabber.ccchb.de"
-prosody_ssl_cert: "/etc/letsencrypt/live/{{ prosody_domain }}/fullchain.pem"
-prosody_ssl_key: "/etc/letsencrypt/live/{{ prosody_domain }}/privkey.pem"
+prosody_ssl_cert: "/etc/prosody/certs/fullchain.pem"
+prosody_ssl_key: "/etc/prosody/certs/privkey.pem"
 prosody_allow_registration: false
 
 prosody_nginx_install: true
diff --git a/roles/prosody/tasks/main.yml b/roles/prosody/tasks/main.yml
index fffe4b6..19464ed 100644
--- a/roles/prosody/tasks/main.yml
+++ b/roles/prosody/tasks/main.yml
@@ -16,6 +16,6 @@
 - name: Configure prosody
   template:
     src: prosody.cfg.lua.j2
-    dest: /etc/prosody/prosody_test.cfg.lua
+    dest: /etc/prosody/prosody.cfg.lua
 
 ...
diff --git a/roles/prosody/templates/prosody.cfg.lua.j2 b/roles/prosody/templates/prosody.cfg.lua.j2
index 32dfeae..20b182d 100644
--- a/roles/prosody/templates/prosody.cfg.lua.j2
+++ b/roles/prosody/templates/prosody.cfg.lua.j2
@@ -56,6 +56,7 @@ modules_enabled = {
 
 	-- Admin interfaces
 		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		"admin_shell";
 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
 	-- HTTP modules
@@ -71,6 +72,12 @@ modules_enabled = {
 		--"motd"; -- Send a message to users when they log in
 		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
 		"turn_external";
+		"carbons";
+		"blocklist";
+		"mam";
+		"csi_simple";
+		"vcard_legacy";
+		"proxy65";
 };
 
 -- These modules are auto-loaded, but should you want