diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index 852d404ed23..433c1e3253a 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(3, ref('account.group_account_manager'))]"/>
+        </record>
+    </data>
     <data>
-
         <function model="account.chart.template" name="try_loading">
             <value eval="[]"/>
             <value>generic_coa</value>
@@ -35,10 +39,6 @@
                 Command.create({'value': 'percent', 'value_amount': 70.0, 'delay_type': 'days_after_end_of_next_month','nb_days': 0})]"/>
         </record>
 
-        <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('account.group_account_invoice'))]"/>
-        </record>
-
         <!-- Add Payment terms on some demo partners -->
         <record id="base.res_partner_2" model="res.partner">
             <field name="property_payment_term_id" ref="account.account_payment_term_30days"/>
diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml
index f886c125289..86174b45121 100644
--- a/addons/event/data/event_demo.xml
+++ b/addons/event/data/event_demo.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
-<odoo><data>
+<odoo>
+    <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(3, ref('event.group_event_manager'))]"/>
+        </record>
+    </data>
 
     <!-- Event -->
     <record id="event.event_0" model="event.event">
@@ -269,5 +274,4 @@
         <field name="seats_max">10</field>
         <field name="sequence">10</field>
     </record>
-
-</data></odoo>
+</odoo>
diff --git a/addons/fleet/data/fleet_demo.xml b/addons/fleet/data/fleet_demo.xml
index c3c4ad0d98d..da96b3c461a 100644
--- a/addons/fleet/data/fleet_demo.xml
+++ b/addons/fleet/data/fleet_demo.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
-      <!--Users-->
-      <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4, ref('fleet.fleet_group_manager'))]" />
-      </record>
+    <record id="base.user_demo" model="res.users">
+        <field name="groups_id" eval="[(3, ref('fleet.fleet_group_manager'))]"/>
+    </record>
 
         <record id="fleet_vehicle_state_ordered" model="fleet.vehicle.state">
             <field name="name">Ordered</field>
diff --git a/addons/hr/data/hr_demo.xml b/addons/hr/data/hr_demo.xml
index fec050f9a6e..2fdc8a15eca 100644
--- a/addons/hr/data/hr_demo.xml
+++ b/addons/hr/data/hr_demo.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(3, ref('hr.group_hr_manager'))]"/>
+        </record>
 
         <!--Department-->
         <record id="dep_management" model="hr.department">
diff --git a/addons/hr_attendance/data/hr_attendance_demo.xml b/addons/hr_attendance/data/hr_attendance_demo.xml
index 2329bfa74ca..911efabd241 100644
--- a/addons/hr_attendance/data/hr_attendance_demo.xml
+++ b/addons/hr_attendance/data/hr_attendance_demo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="True">
+    <data noupdate="1">
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4, ref('hr_attendance.group_hr_attendance_manager'))]"/>
+            <field name="groups_id" eval="[(3, ref('hr_attendance.group_hr_attendance_manager'))]"/>
         </record>
 
         <record id="hr.employee_al" model="hr.employee">
diff --git a/addons/hr_contract/data/hr_contract_demo.xml b/addons/hr_contract/data/hr_contract_demo.xml
index bfeae6c7ad9..de5fb65934f 100644
--- a/addons/hr_contract/data/hr_contract_demo.xml
+++ b/addons/hr_contract/data/hr_contract_demo.xml
@@ -8,9 +8,13 @@
         <field name="default_resource_calendar_id" ref="resource.resource_calendar_std_38h"/>
     </record>
 
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4, ref('hr_contract.group_hr_contract_manager'))]"/>
-    </record>
+    <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[
+                (3, ref('hr_contract.group_hr_contract_manager')),
+                (3, ref('hr_contract.group_hr_contract_employee_manager'))]"/>
+        </record>
+    </data>
 
     <record id="hr_contract_admin" model="hr.contract">
         <field name="name">Mitchell Admin Contract</field>
diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml
index bdc3f1ff19a..d230693facb 100644
--- a/addons/hr_expense/data/hr_expense_demo.xml
+++ b/addons/hr_expense/data/hr_expense_demo.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(3, ref('hr_expense.group_hr_expense_manager'))]"/>
+        </record>
 
         <record id="hr.employee_mit" model="hr.employee">
             <field name="private_email">douglas.fletcher51@example.com</field>
diff --git a/addons/hr_holidays/data/hr_holidays_demo.xml b/addons/hr_holidays/data/hr_holidays_demo.xml
index 15df8957c49..3cb2ee71a04 100644
--- a/addons/hr_holidays/data/hr_holidays_demo.xml
+++ b/addons/hr_holidays/data/hr_holidays_demo.xml
@@ -3,7 +3,7 @@
 <data noupdate="1">
 
     <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4, ref('hr_holidays.group_hr_holidays_user'))]"/>
+        <field name="groups_id" eval="[(3, ref('hr_holidays.group_hr_holidays_manager'))]"/>
     </record>
 
     <!--Time Off Type-->
diff --git a/addons/hr_recruitment/data/hr_recruitment_demo.xml b/addons/hr_recruitment/data/hr_recruitment_demo.xml
index 955e709a78c..44675904202 100644
--- a/addons/hr_recruitment/data/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/data/hr_recruitment_demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <odoo noupdate="1">
     <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4, ref('hr_recruitment.group_hr_recruitment_user'))]"/>
+        <field name="groups_id" eval="[(3, ref('hr_recruitment.group_hr_recruitment_manager'))]"/>
     </record>
 
     <!--Manage the job_id to get in hr.applicant-->
diff --git a/addons/hr_timesheet/data/hr_timesheet_demo.xml b/addons/hr_timesheet/data/hr_timesheet_demo.xml
index d4e8526ac5f..3b2cc64bb17 100644
--- a/addons/hr_timesheet/data/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/data/hr_timesheet_demo.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
-    <!-- User Demo -->
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[
-            Command.unlink(ref('project.group_project_manager')),
-            Command.unlink(ref('group_timesheet_manager')),
-            Command.link(ref('group_hr_timesheet_user'))
-        ]"/>
-    </record>
+    <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[
+                (3, ref('project.group_project_manager')),
+                (3, ref('hr_timesheet.group_timesheet_manager'))]"/>
+        </record>
+    </data>
 
     <!-- Projects -->
     <record id="project.project_project_1" model="project.project">
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_channel.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_channel.xml
index cca8bf9e3ad..3362ac7cbb3 100644
--- a/addons/im_livechat/demo/im_livechat_channel/im_livechat_channel.xml
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_channel.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <odoo>
+    <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(3, ref('im_livechat.im_livechat_group_manager'))]"/>
+        </record>
+    </data>
     <data>
         <record id="im_livechat_channel_rule_demo" model="im_livechat.channel.rule">
             <field name="regex_url">/im_livechat/</field>
diff --git a/addons/lunch/data/lunch_demo.xml b/addons/lunch/data/lunch_demo.xml
index 12a0c9afda2..6d6f8dc7720 100644
--- a/addons/lunch/data/lunch_demo.xml
+++ b/addons/lunch/data/lunch_demo.xml
@@ -90,7 +90,7 @@
 
         <record id="base.user_demo" model="res.users">
             <field name="last_lunch_location_id" ref="location_office_3"/>
-            <field name="groups_id" eval="[(4, ref('lunch.group_lunch_user'))]"/>
+            <field name="groups_id" eval="[(3, ref('lunch.group_lunch_manager'))]"/>
         </record>
 
         <record model="lunch.product.category" id="categ_pasta">
diff --git a/addons/point_of_sale/data/point_of_sale_demo.xml b/addons/point_of_sale/data/point_of_sale_demo.xml
index 1ab29602a7d..5d1f4f0e50d 100644
--- a/addons/point_of_sale/data/point_of_sale_demo.xml
+++ b/addons/point_of_sale/data/point_of_sale_demo.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(3, ref('point_of_sale.group_pos_manager'))]"/>
+        </record>
+
         <!-- Partners with Barcodes -->
         <record id='base.res_partner_1' model='res.partner'>
             <field name='barcode'>0420100000005</field>
diff --git a/addons/pos_restaurant/tests/test_frontend.py b/addons/pos_restaurant/tests/test_frontend.py
index 5e7712f15d6..78f686399cc 100644
--- a/addons/pos_restaurant/tests/test_frontend.py
+++ b/addons/pos_restaurant/tests/test_frontend.py
@@ -9,6 +9,10 @@ class TestFrontend(odoo.tests.HttpCase):
     def setUp(self):
         super().setUp()
         self.env = self.env(user=self.env.ref('base.user_admin'))
+        self.env.ref('base.user_demo').write({
+            'groups_id': [(4, self.env.ref('point_of_sale.group_pos_manager').id)],
+        })
+
         account_obj = self.env['account.account']
 
         account_receivable = account_obj.create({'code': 'X1012',
diff --git a/addons/project/data/project_demo.xml b/addons/project/data/project_demo.xml
index f5345fbd52a..ff459caf0fa 100644
--- a/addons/project/data/project_demo.xml
+++ b/addons/project/data/project_demo.xml
@@ -4,10 +4,7 @@
 
         <!-- Users -->
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[
-                Command.unlink(ref('group_project_manager')),
-                Command.link(ref('group_project_user'))
-            ]"/>
+            <field name="groups_id" eval="[(3, ref('project.group_project_manager'))]"/>
         </record>
 
         <!-- Groups : Add milestones feature by default -->
diff --git a/addons/purchase/data/purchase_demo.xml b/addons/purchase/data/purchase_demo.xml
index 02eef441eb5..09b4f6bf09b 100644
--- a/addons/purchase/data/purchase_demo.xml
+++ b/addons/purchase/data/purchase_demo.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="base.user_demo" model="res.users">
-            <field eval="[(3, ref('group_purchase_manager')), (4, ref('group_purchase_user'))]" name="groups_id"/>
+            <field name="groups_id" eval="[(3, ref('purchase.group_purchase_manager'))]"/>
         </record>
 
         <record id="base.res_partner_1" model="res.partner">
diff --git a/addons/sales_team/data/crm_team_demo.xml b/addons/sales_team/data/crm_team_demo.xml
index 98141b5dac3..158a8185739 100644
--- a/addons/sales_team/data/crm_team_demo.xml
+++ b/addons/sales_team/data/crm_team_demo.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <record model="res.users" id="base.user_demo">
-            <field name="groups_id" eval="[(4,ref('sales_team.group_sale_salesman'))]"/>
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[
+                (3, ref('sales_team.group_sale_manager')),
+                (3, ref('sales_team.group_sale_salesman_all_leads'))]"/>
         </record>
 
         <record model="crm.team" id="team_sales_department">
diff --git a/addons/survey/data/res_users_demo.xml b/addons/survey/data/res_users_demo.xml
index 0daa9eb465e..49b8d21ee28 100644
--- a/addons/survey/data/res_users_demo.xml
+++ b/addons/survey/data/res_users_demo.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <!-- Grant survey permissions to demo user -->
         <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('group_survey_manager'))]" name="groups_id"/>
+            <field name="groups_id" eval="[(3, ref('survey.group_survey_manager'))]"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/web/tests/test_click_everywhere.py b/addons/web/tests/test_click_everywhere.py
index f56eb3ed5ca..048e11928e2 100644
--- a/addons/web/tests/test_click_everywhere.py
+++ b/addons/web/tests/test_click_everywhere.py
@@ -34,7 +34,7 @@ class TestMenusAdminLight(odoo.tests.HttpCase):
     def test_01_click_apps_menus_as_admin(self):
         self.browser_js("/web", "odoo.loader.modules.get('@web/webclient/clickbot/clickbot_loader').startClickEverywhere(undefined, true);", "odoo.isReady === true", login="admin", timeout=120)
 
-@odoo.tests.tagged('post_install', '-at_install',)
+@odoo.tests.tagged('post_install', '-at_install')
 class TestMenusDemoLight(odoo.tests.HttpCase):
     allow_end_on_form = True
     def test_01_click_apps_menus_as_demo(self):