diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
index 6573631..927e563 100644
--- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb
+++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
@@ -89,9 +89,11 @@ modules:
           - allow: admin
         access_create: muc_create
         access_persistent: muc_create
+        access_register: muc_create
         max_user_conferences: 1000
         default_room_options:
           mam: true
+        preload_rooms: true
       mod_http_upload:
         put_url: "https://uploads.kosmos.chat/8af2c77"
         external_secret: "#{ejabberd_credentials["uploads_secret"]}"
@@ -122,6 +124,7 @@ modules:
           - allow: admin
         access_create: muc_create
         access_persistent: muc_create
+        access_register: muc_create
         max_user_conferences: 1000
         default_room_options:
           anonymous: false
@@ -130,6 +133,7 @@ modules:
           public_list: false
           persistent: true
           mam: true
+        preload_rooms: true
       mod_http_upload:
         put_url: "https://uploads.kosmos.chat/2802cfe"
         external_secret: "#{ejabberd_credentials["uploads_secret"]}"
@@ -186,16 +190,6 @@ template "/opt/ejabberd/conf/ejabberd.yml" do
   notifies :reload, "service[ejabberd]", :delayed
 end
 
-# Set permissions for the upload folders
-%w(xmpp.kosmos.org xmpp.5apps.com).each do |domain|
-  directory "/opt/ejabberd/uploads/#{domain}" do
-    owner "ejabberd"
-    group "ejabberd"
-    mode 0750
-    recursive true
-  end
-end
-
 service "ejabberd" do
   action [:enable, :start]
 end
diff --git a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
index 758ac6e..4d8cb70 100644
--- a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
+++ b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
@@ -40,6 +40,7 @@ listen:
     port: 5222
     ip: "::"
     module: ejabberd_c2s
+    use_proxy_protocol: true
     starttls: true
     max_stanza_size: 65536
     shaper: c2s_shaper
@@ -48,6 +49,7 @@ listen:
     port: 5223
     ip: "::"
     module: ejabberd_c2s
+    use_proxy_protocol: true
     tls: true
     max_stanza_size: 65536
     shaper: c2s_shaper
@@ -56,12 +58,14 @@ listen:
     port: 5269
     ip: "::"
     module: ejabberd_s2s_in
+    use_proxy_protocol: true
     max_stanza_size: 131072
     shaper: s2s_shaper
   -
     port: 5443
     ip: "::"
     module: ejabberd_http
+    use_proxy_protocol: true
     request_handlers:
       "/ws": ejabberd_http_ws
       "/bosh": mod_bosh