diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 0dead3cf5b339a6735e654415bdbad87db4f1c40..2b99ea09370b047cbda702cbac43e4f93799b1ec 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -552,12 +552,6 @@ function update_prosody_modules {
         fi
     fi
 
-    if ! grep -q '"vcard"' /etc/prosody/prosody.cfg.lua; then
-        systemctl stop prosody
-        sed -i '/"pep"/a "vcard";' /etc/prosody/prosody.cfg.lua
-        systemctl start prosody
-        xmpp_restart=1
-    fi
     if ! grep -q "omemo_all_access" /etc/prosody/prosody.cfg.lua; then
         sed -i '/"pep";/a "omemo_all_access"; -- Fix for PEP with OMEMO' /etc/prosody/prosody.cfg.lua
         sed -i 's|"omemo_all_access";|  "omemo_all_access";|g' /etc/prosody/prosody.cfg.lua
@@ -765,6 +759,11 @@ function upgrade_xmpp {
     # remove any broadcast settings
     prosody_remove_module "broadcast"
 
+    # handling avatars
+    prosody_remove_module "pep_vcard_avatar"
+    prosody_remove_module "vcard"
+    prosody_add_module "profile"
+
     if grep -q "/etc/ssl/certs/xmpp.dhparam" /etc/prosody/prosody.cfg.lua; then
         cp /etc/ssl/certs/xmpp.dhparam /etc/prosody/xmpp.dhparam
         chown prosody:prosody /etc/prosody/xmpp.dhparam
@@ -1010,9 +1009,8 @@ function xmpp_modules {
       echo '  "pep"; -- Personal Eventing Protocol (to support OMEMO)';
       echo '  "firewall"; -- Block addresses';
       echo '  "omemo_all_access"; -- Fix for PEP with OMEMO';
-      echo '  "vcard"; -- Personal Eventing Protocol (to support OMEMO)';
+      echo '  "profile"; -- Avatars';
       echo '  "e2e_policy"; -- To support OMEMO';
-      echo '  "pep_vcard_avatar"; -- Personal Eventing Protocol (to support OMEMO)';
       echo '  "blocklist"; -- Privacy lists';
       echo '  "s2s_blacklist"; -- Blacklist particular servers';
       echo '  "privacy_lists"; -- Privacy lists';