diff --git a/.hgconf b/.hgconf
index ce629c1553828f9f0f0575f38843596f1385e1bf_LmhnY29uZg==..dd90427708ac91486ddb9f2027c9df459fc5682b_LmhnY29uZg== 100644
--- a/.hgconf
+++ b/.hgconf
@@ -1,2 +1,17 @@
+[OCA > akretion/account-invoicing]
+pulluri = https://github.com/akretion/account-invoicing.git
+layout = dependency_modules-11.0/account-invoicing
+track = 712f9d72b8d8cb808066181d0573bd3e6162b1f3
+
+[account_payment_split]
+pulluri = https://orus.io/xcg/odoo-modules/account_payment_split
+layout = dependency_modules-11.0/account_payment_split
+track = 11.0.1.0.1
+
+[account_period]
+pulluri = https://orus.io/xcg/odoo-modules/account_period
+layout = dependency_modules-11.0/account_period
+track = 11.0.1.3.0
+
 [analytic_structure]
 pulluri = https://orus.io/xcg/odoo-modules/analytic_structure
@@ -1,8 +16,7 @@
 [analytic_structure]
 pulluri = https://orus.io/xcg/odoo-modules/analytic_structure
-layout = orus.io-xcg/odoo-modules/analytic_structure
-track = 11.0
-expand =
+layout = dependency_modules-11.0/analytic_structure
+track = 11.0.1.1.0
 
 [account_analytic_structure]
 pulluri = https://orus.io/xcg/odoo-modules/account_analytic_structure
@@ -6,19 +20,8 @@
 
 [account_analytic_structure]
 pulluri = https://orus.io/xcg/odoo-modules/account_analytic_structure
-layout = orus.io-xcg/odoo-modules/account_analytic_structure
-track = 11.0
-expand =
-
-[account_payment_split]
-pulluri = https://orus.io/xcg/odoo-modules/account_payment_split
-layout = orus.io-xcg/odoo-modules/account_payment_split
-track = 11.0-20210830
-
-[account_period]
-pulluri = https://orus.io/xcg/odoo-modules/account_period
-layout = orus.io-xcg/odoo-modules/account_period
-track = 11.0
+layout = dependency_modules-11.0/account_analytic_structure
+track = 11.0.1.0.0
 
 [base_context]
 pulluri = https://orus.io/xcg/odoo-modules/base_context
@@ -22,8 +25,23 @@
 
 [base_context]
 pulluri = https://orus.io/xcg/odoo-modules/base_context
-layout = orus.io-xcg/odoo-modules/base_context
-track = 11.0
+layout = dependency_modules-11.0/base_context
+track = 11.0.1.0.0
+
+[account_export]
+pulluri = https://orus.io/xcg/odoo-modules/account_export
+layout = dependency_modules-11.0/account_export
+track = 11.0.1.1.0
+
+[partner_codes]
+pulluri = https://orus.io/xcg/odoo-modules/partner_codes
+layout = dependency_modules-11.0/partner_codes
+track = 11.0.1.0.0
+
+[OCA/queue]
+pulluri = https://github.com/xcgd/queue.git
+layout = dependency_modules-11.0/queue
+track = 4fca5c7e7e95dc16e23bc56d0de70421a9ffff09
 
 [OCA/reporting-engine]
 pulluri = https://github.com/xcgd/reporting-engine.git
@@ -27,11 +45,6 @@
 
 [OCA/reporting-engine]
 pulluri = https://github.com/xcgd/reporting-engine.git
-layout = github.com/xcgd/reporting-engine
-track = d79115deade2674ac2f87b9b6cacdc8c1afaefd0
-
-[OCA/account-invoicing]
-pulluri = https://github.com/OCA/account-invoicing.git
-layout = github.com/OCA/account-invoicing
-track = 277b001e983e68e268fa9f4a3db4becf4fab0470
+layout = dependency_modules-11.0/reporting-engine
+track = 5f4bbabdd8ddd2ee2b7b591fb08e0bc2252b4d17
 
@@ -37,21 +50,8 @@
 
-[account_export]
-pulluri = https://orus.io/xcg/odoo-modules/account_export
-layout = orus.io-xcg/odoo-modules/account_export
-track = 11.0
-expand =
-
-[partner_codes]
-pulluri = https://orus.io/xcg/odoo-modules/partner_codes
-layout = orus.io-xcg/odoo-modules/partner_codes
-track = 11.0
-
-[xcgd/queue]
-pulluri = https://github.com/xcgd/queue.git
-layout = github.com/xcgd/queue
-track = ef9638b02632f4998c0fe0a355129c3e76e5e149
-
-# === Not a direct dependency, need this to avoid errors in Odoo 11 tests. ===
+[xcgd/web]
+pulluri = https://github.com/xcgd/web.git
+layout = xcgd/web
+track = 71567f00474fd5c960904cc6433636e8e79c7341
 
 [patch_import_yml]
 pulluri = https://orus.io/xcg/odoo-modules/patch_import_yml
@@ -55,5 +55,5 @@
 
 [patch_import_yml]
 pulluri = https://orus.io/xcg/odoo-modules/patch_import_yml
-layout = orus.io-xcg/odoo-modules/patch_import_yml
+layout = dependency_modules-11.0/patch_import_yml
 track = 11.0.1.0