diff --git a/addons/l10n_be/__manifest__.py b/addons/l10n_be/__manifest__.py
index ee5407e817a..8ef1f2d09ef 100644
--- a/addons/l10n_be/__manifest__.py
+++ b/addons/l10n_be/__manifest__.py
@@ -54,7 +54,7 @@ Wizards provided by this module:
         'data/menuitem_data.xml',
     ],
     'demo': [
-        'demo/l10n_be_demo.yml',
+        'demo/l10n_be_demo.xml',
     ],
     'website': 'https://www.odoo.com/page/accounting',
     'post_init_hook': 'load_translations',
diff --git a/addons/l10n_be/demo/l10n_be_demo.xml b/addons/l10n_be/demo/l10n_be_demo.xml
new file mode 100644
index 00000000000..997b17249c1
--- /dev/null
+++ b/addons/l10n_be/demo/l10n_be_demo.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="l10n_be.a1000" model="account.account.template">
+        <field name="tag_ids" eval="[(4, ref('account.demo_capital_account'))]"/>
+    </record>
+    <record id="l10n_be.a300" model="account.account.template">
+        <field name="tag_ids" eval="[(4, ref('account.demo_stock_account'))]"/>
+    </record>
+    <record id="l10n_be.a7600" model="account.account.template">
+        <field name="tag_ids" eval="[(4, ref('account.demo_sale_of_land_account'))]"/>
+    </record>
+    <record id="l10n_be.a6201" model="account.account.template">
+        <field name="tag_ids" eval="[(4, ref('account.demo_ceo_wages_account'))]"/>
+    </record>
+    <record id="l10n_be.a24011" model="account.account.template">
+        <field name="tag_ids" eval="[(4, ref('account.demo_coffee_machine_account'))]"/>
+    </record>
+    <function model="account.account" name="write">
+        <value model="account.account" search="[('code', 'like', obj().env.ref('l10n_be.a1000').code)]"/>
+        <value eval="{'tag_ids': [(4, ref('account.demo_capital_account'))]}"/>
+    </function>
+    <function model="account.account" name="write">
+        <value model="account.account" search="[('code', 'like', obj().env.ref('l10n_be.a300').code)]"/>
+        <value eval="{'tag_ids': [(4, ref('account.demo_stock_account'))]}"/>
+    </function>
+    <function model="account.account" name="write">
+        <value model="account.account" search="[('code', 'like', obj().env.ref('l10n_be.a7600').code)]"/>
+        <value eval="{'tag_ids': [(4, ref('account.demo_sale_of_land_account'))]}"/>
+    </function>
+    <function model="account.account" name="write">
+        <value model="account.account" search="[('code', 'like', obj().env.ref('l10n_be.a6201').code)]"/>
+        <value eval="{'tag_ids': [(4, ref('account.demo_ceo_wages_account'))]}"/>
+    </function>
+    <function model="account.account" name="write">
+        <value model="account.account" search="[('code', 'like', obj().env.ref('l10n_be.a24011').code)]"/>
+        <value eval="{'tag_ids': [(4, ref('account.demo_coffee_machine_account'))]}"/>
+    </function>
+</odoo>
diff --git a/addons/l10n_be/demo/l10n_be_demo.yml b/addons/l10n_be/demo/l10n_be_demo.yml
deleted file mode 100644
index aa66954f3b7..00000000000
--- a/addons/l10n_be/demo/l10n_be_demo.yml
+++ /dev/null
@@ -1,18 +0,0 @@
--
-  Set the demo tags on account templates and on their respective accounts (already generated during the loading of data)
--
-  !python {model: account.account.template, id: False}: |
-      mapping_list = [
-          ('a1000', 'account.demo_capital_account'),
-          ('a300', 'account.demo_stock_account'),
-          ('a7600', 'account.demo_sale_of_land_account'),
-          ('a6201', 'account.demo_ceo_wages_account'),
-          ('a24011', 'account.demo_coffee_machine_account'),
-      ]
-      for xml_id, tag in mapping_list:
-          account_template = self.browse(ref(xml_id))
-          account_template.write({'tag_ids': [(4, ref(tag))]})
-          accounts = self.env['account.account'].search([('code', 'like', account_template.code)])
-          if accounts:
-              accounts.write({'tag_ids': [(4,ref(tag))]})
-