diff --git a/roles/jitsi/tasks/conf.yml b/roles/jitsi/tasks/conf.yml
index a75a7e4..2078412 100644
--- a/roles/jitsi/tasks/conf.yml
+++ b/roles/jitsi/tasks/conf.yml
@@ -21,6 +21,9 @@
         - user: "{{ jitsi_jigasi_xmpp_user }}"
           pass: "{{ jitsi_jigasi_xmpp_pass }}"
 
+    - name: add focus component in focus user roster
+      command: prosodyctl mod_roster_command subscribe focus.{{ jitsi_domain }} {{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}
+
   when: jitsi_prosody_conf is defined and jitsi_prosody_conf.changed
   tags: jitsi
 
diff --git a/roles/jitsi/tasks/facts.yml b/roles/jitsi/tasks/facts.yml
index 966db99..fe36135 100644
--- a/roles/jitsi/tasks/facts.yml
+++ b/roles/jitsi/tasks/facts.yml
@@ -13,15 +13,6 @@
   when: jitsi_jvb_xmpp_pass is not defined
   tags: jitsi
 
-- name: Generate a random secret for jicofo
-  block:
-    - import_tasks: ../includes/get_rand_pass.yml
-      vars:
-        - pass_file: "{{ jitsi_root_dir }}/meta/ansible_jicofo_xmpp_secret"
-    - set_fact: jitsi_jicofo_xmpp_secret={{ rand_pass }}
-  when: jitsi_jicofo_xmpp_secret is not defined
-  tags: jitsi
-
 - name: Generate a random password for the focus account
   block:
     - import_tasks: ../includes/get_rand_pass.yml
diff --git a/roles/jitsi/templates/jicofo/jicofo.conf.j2 b/roles/jitsi/templates/jicofo/jicofo.conf.j2
index f068490..2796f80 100644
--- a/roles/jitsi/templates/jicofo/jicofo.conf.j2
+++ b/roles/jitsi/templates/jicofo/jicofo.conf.j2
@@ -3,7 +3,6 @@ JICOFO_HOST={{ jitsi_xmpp_server }}
 JICOFO_DOMAIN={{ jitsi_domain }}
 JICOFO_USER={{ jitsi_jicofo_xmpp_user }}
 JICOFO_USERDOMAIN={{ jitsi_auth_domain }}
-JICOFO_SECRET='{{ jitsi_jicofo_xmpp_secret }}'
 JICOFO_USER_PASS='{{ jitsi_jicofo_xmpp_pass }}'
 JICOFO_OPTS=''
 JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION={{ jitsi_root_dir }}/etc -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo"
diff --git a/roles/jitsi/templates/prosody.cfg.lua.j2 b/roles/jitsi/templates/prosody.cfg.lua.j2
index 9173a4e..e328861 100644
--- a/roles/jitsi/templates/prosody.cfg.lua.j2
+++ b/roles/jitsi/templates/prosody.cfg.lua.j2
@@ -86,8 +86,8 @@ Component "internal.{{ jitsi_auth_domain }}" "muc"
   modules_enabled = { "ping"; }
   muc_room_cache_size = 1000
 
-Component "focus.{{ jitsi_domain }}"
-  component_secret = "{{ jitsi_jicofo_xmpp_secret }}"
+Component "focus.{{ jitsi_domain }}" "client_proxy"
+  target_address = "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}"
 
 Component "speakerstats.{{ jitsi_domain }}" "speakerstats_component"
   muc_component = "conference.{{ jitsi_domain }}"
diff --git a/roles/prosody/defaults/main.yml b/roles/prosody/defaults/main.yml
index 0bf53d6..b48cc0b 100644
--- a/roles/prosody/defaults/main.yml
+++ b/roles/prosody/defaults/main.yml
@@ -31,6 +31,10 @@ prosody_base_modules:
     url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_conference_duration.lua
   - name: mod_conference_duration_component
     url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_conference_duration_component.lua
+  - name: mod_client_proxy
+    url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_client_proxy.lua
+  - name: mod_roster_command
+    url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_roster_command.lua
 
 prosody_extra_modules: []
 prosody_modules: "{{ (prosody_base_modules + prosody_extra_modules) | unique }}"