diff --git a/addons/mail/data/neutralize.sql b/addons/mail/data/neutralize.sql
index f0bc18bdf6e..7de7d0102c5 100644
--- a/addons/mail/data/neutralize.sql
+++ b/addons/mail/data/neutralize.sql
@@ -6,9 +6,9 @@ UPDATE fetchmail_server
    SET active = false;
 
 -- reset WEB Push Notification:
--- * delete VAPID keys
+-- * delete VAPID/JWT keys
 DELETE FROM ir_config_parameter
-    WHERE key IN ('mail.web_push_vapid_private_key', 'mail.web_push_vapid_public_key');
+    WHERE key IN ('mail.web_push_vapid_private_key', 'mail.web_push_vapid_public_key', 'mail.sfu_server_key');
 -- * delete delayed messages (CRON)
 TRUNCATE mail_notification_web_push;
 -- * delete Devices for each partners
diff --git a/addons/mail/models/discuss/discuss_channel.py b/addons/mail/models/discuss/discuss_channel.py
index d5c9e2e8219..c785efa414d 100644
--- a/addons/mail/models/discuss/discuss_channel.py
+++ b/addons/mail/models/discuss/discuss_channel.py
@@ -69,6 +69,8 @@ class Channel(models.Model):
         'discuss.channel.member', 'channel_id', string='Members',
         groups='base.group_user')
     pinned_message_ids = fields.One2many('mail.message', 'res_id', domain=[('model', '=', 'discuss.channel'), ('pinned_at', '!=', False)], string='Pinned Messages')
+    sfu_channel_uuid = fields.Char(groups="base.group_system")
+    sfu_server_url = fields.Char(groups="base.group_system")
     rtc_session_ids = fields.One2many('discuss.channel.rtc.session', 'channel_id', groups="base.group_system")
     is_member = fields.Boolean('Is Member', compute='_compute_is_member', search='_search_is_member')
     member_count = fields.Integer(string="Member Count", compute='_compute_member_count', compute_sudo=True)
diff --git a/addons/mail/models/res_config_settings.py b/addons/mail/models/res_config_settings.py
index dcd4eababa9..470200d2532 100644
--- a/addons/mail/models/res_config_settings.py
+++ b/addons/mail/models/res_config_settings.py
@@ -36,6 +36,8 @@ class ResConfigSettings(models.TransientModel):
         'Twilio Account Auth Token',
         config_parameter='mail.twilio_account_token',
     )
+    sfu_server_url = fields.Char("SFU Server URL", config_parameter="mail.sfu_server_url")
+    sfu_server_key = fields.Char("SFU Server key", config_parameter="mail.sfu_server_key", help="Base64 encoded key")
     email_primary_color = fields.Char(related='company_id.email_primary_color', readonly=False)
     email_secondary_color = fields.Char(related='company_id.email_secondary_color', readonly=False)