diff --git a/conf/repo/account.yml b/conf/repo/account.yml
index 2365945..5e56527 100644
--- a/conf/repo/account.yml
+++ b/conf/repo/account.yml
@@ -12,8 +12,9 @@ account-analytic:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo account analytic related addons
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -30,8 +31,9 @@ account-budgeting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Account Budgeting
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -49,8 +51,9 @@ account-closing:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo accountant closing tools
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -68,8 +71,9 @@ account-consolidation:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Odoo account consolidation addons
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -88,8 +92,9 @@ account-financial-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Financial reports for odoo
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -107,8 +112,9 @@ account-financial-tools:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo accountant financial tools and utils
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -126,8 +132,9 @@ account-fiscal-rule:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo taxes & fiscal rules management
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -145,8 +152,9 @@ account-invoice-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo invoicing reports
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -164,8 +172,9 @@ account-invoicing:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo invoicing extension addons
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -183,8 +192,9 @@ account-payment:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Project supervised by the banking psc
   psc: banking-maintainers
   psc_rep: banking-maintainers-psc-representative
@@ -202,8 +212,9 @@ account-reconcile:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Odoo account reconciliation modules (statements, data completion...)
   psc: banking-maintainers
   psc_rep: banking-maintainers-psc-representative
diff --git a/conf/repo/agreement.yml b/conf/repo/agreement.yml
index b395ad6..e28fca7 100644
--- a/conf/repo/agreement.yml
+++ b/conf/repo/agreement.yml
@@ -3,8 +3,9 @@ agreement:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Agreement
-  default_branch: "15.0"
+  default_branch: "18.0"
   name: Agreement
   psc: project-service-maintainers
   psc_rep: project-service-maintainers-psc-representative
diff --git a/conf/repo/apps.yml b/conf/repo/apps.yml
index 0892883..e0da266 100644
--- a/conf/repo/apps.yml
+++ b/conf/repo/apps.yml
@@ -8,8 +8,9 @@ apps-store:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Apps
-  default_branch: "15.0"
+  default_branch: "18.0"
   name: Oca apps store module repository
   psc: website-maintainers
   psc_rep: website-maintainers-psc-representative
diff --git a/conf/repo/bank.yml b/conf/repo/bank.yml
index d313f13..e258c3b 100644
--- a/conf/repo/bank.yml
+++ b/conf/repo/bank.yml
@@ -14,8 +14,9 @@ bank-payment:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Bank
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo electronic payment
   psc: banking-maintainers
   psc_rep: banking-maintainers-psc-representative
@@ -32,8 +33,9 @@ bank-statement-import:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Bank
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Bank import addons
   psc: banking-maintainers
   psc_rep: banking-maintainers-psc-representative
diff --git a/conf/repo/brand.yml b/conf/repo/brand.yml
index 3b5bea7..16ffbf8 100644
--- a/conf/repo/brand.yml
+++ b/conf/repo/brand.yml
@@ -6,8 +6,9 @@ brand:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Brand
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Manage brands for products and companies
   psc: brand-maintainers
   psc_rep: brand-maintainers-psc-representative
diff --git a/conf/repo/business.yml b/conf/repo/business.yml
index 17a7f52..4196d15 100644
--- a/conf/repo/business.yml
+++ b/conf/repo/business.yml
@@ -10,8 +10,9 @@ business-requirement:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Business
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Business requirements management via odoo
   psc: project-service-maintainers
   psc_rep: project-service-maintainers-psc-representative
diff --git a/conf/repo/calendar.yml b/conf/repo/calendar.yml
index 3f51f6a..7a4e38a 100644
--- a/conf/repo/calendar.yml
+++ b/conf/repo/calendar.yml
@@ -9,8 +9,9 @@ calendar:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Calendar
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Calendar
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
diff --git a/conf/repo/commission.yml b/conf/repo/commission.yml
index 34c76d4..1bd443c 100644
--- a/conf/repo/commission.yml
+++ b/conf/repo/commission.yml
@@ -11,8 +11,9 @@ commission:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Commission
-  default_branch: "15.0"
+  default_branch: "18.0"
   name: Odoo commission management
   psc: crm-sales-marketing-maintainers
   psc_rep: crm-sales-marketing-maintainers-psc-representative
diff --git a/conf/repo/community.yml b/conf/repo/community.yml
index 953f9f6..e79fc0b 100644
--- a/conf/repo/community.yml
+++ b/conf/repo/community.yml
@@ -11,8 +11,9 @@ community-data-files:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Community
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Community Data Files
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
diff --git a/conf/repo/connector.yml b/conf/repo/connector.yml
index 4d440cc..b7367dc 100644
--- a/conf/repo/connector.yml
+++ b/conf/repo/connector.yml
@@ -11,8 +11,9 @@ connector:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo generic connector framework (jobs queue, asynchronous tasks, channels)
   psc: connector-maintainers
   psc_rep: connector-maintainers-psc-representative
@@ -30,8 +31,9 @@ connector-accountedge:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo modules to connect with account edge (aka myob)
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -47,8 +49,9 @@ connector-cmis:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Cmis connector
   psc: document-maintainers
   psc_rep: document-maintainers-psc-representative
@@ -65,8 +68,9 @@ connector-ecommerce:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Generic module used on odoo for e Commerce industry
   psc: connector-maintainers
   psc_rep: connector-maintainers-psc-representative
@@ -79,8 +83,9 @@ connector-infor:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo modules to integrate with infor
   psc: connector-infor-maintainers
   psc_rep: connector-infor-maintainers-psc-representative
@@ -97,8 +102,9 @@ connector-interfaces:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo generic connector for odbc, .csv,...
   psc: connector-maintainers
   psc_rep: connector-maintainers-psc-representative
@@ -111,8 +117,9 @@ connector-jira:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "15.0"
+  default_branch: "18.0"
   name: Connector Jira
   psc: project-service-maintainers
   psc_rep: project-service-maintainers-psc-representative
@@ -126,8 +133,9 @@ connector-lengow:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Connector Lengow
   psc: connector-lengow-maintainers
   psc_rep: connector-lengow-maintainers-psc-representative
@@ -143,8 +151,9 @@ connector-lims:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Connector Lims
   psc: connector-lims-maintainers
   psc_rep: connector-lims-maintainers-psc-representative
@@ -161,8 +170,9 @@ connector-magento:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Connect odoo with magento
   psc: connector-magento-maintainers
   psc_rep: connector-magento-maintainers-psc-representative
@@ -185,8 +195,9 @@ connector-odoo2odoo:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Connector Odoo2odoo. intercompany process, based on odoo Connector
   psc: board
   psc_rep: board
@@ -204,8 +215,9 @@ connector-prestashop:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Connect odoo with prestashop
   psc: connector-prestashop-maintainers
   psc_rep: connector-prestashop-maintainers-psc-representative
@@ -222,8 +234,9 @@ connector-redmine:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Connector redmine (http://redmine.org)
   psc: project-service-maintainers
   psc_rep: project-service-maintainers-psc-representative
@@ -241,8 +254,9 @@ connector-sage:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Connector with sage
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
@@ -259,8 +273,9 @@ connector-salesforce:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Connect salesforce with odoo
   psc: connector-saleforce-maintainers
   psc_rep: board
@@ -274,8 +289,9 @@ connector-spscommerce:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Connector sps commerce
   psc: board
   psc_rep: board
@@ -295,8 +311,9 @@ connector-telephony:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo modules for telephony integration
   psc: connector-telephony-maintainers
   psc_rep: connector-telephony-maintainers-psc-representative
@@ -312,8 +329,9 @@ connector-woocommerce:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Connector Woocommerce
   psc: connector-woocommerce-maintainers
   psc_rep: connector-woocommerce-maintainers-psc-representative
diff --git a/conf/repo/contract.yml b/conf/repo/contract.yml
index 911f31d..d5062d9 100644
--- a/conf/repo/contract.yml
+++ b/conf/repo/contract.yml
@@ -12,8 +12,9 @@ contract:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Contract
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Contract
   psc: project-service-maintainers
   psc_rep: project-service-maintainers-psc-representative
diff --git a/conf/repo/cooperative.yml b/conf/repo/cooperative.yml
index 4c01b80..c3557f1 100644
--- a/conf/repo/cooperative.yml
+++ b/conf/repo/cooperative.yml
@@ -4,8 +4,9 @@ cooperative:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Cooperative
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Cooperative
   psc: cooperative-maintainers
   psc_rep: cooperative-maintainers-psc-representative
diff --git a/conf/repo/credit.yml b/conf/repo/credit.yml
index 38cd72c..29685e9 100644
--- a/conf/repo/credit.yml
+++ b/conf/repo/credit.yml
@@ -8,8 +8,9 @@ credit-control:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Credit
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo modules for the customer credit control
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
diff --git a/conf/repo/crm.yml b/conf/repo/crm.yml
index 7e39531..6422584 100644
--- a/conf/repo/crm.yml
+++ b/conf/repo/crm.yml
@@ -12,8 +12,9 @@ crm:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Crm
-  default_branch: "15.0"
+  default_branch: "18.0"
   name: Odoo crm, mail & newsletter advanced features
   psc: crm-sales-marketing-maintainers
   psc_rep: crm-sales-marketing-maintainers-psc-representative
diff --git a/conf/repo/currency.yml b/conf/repo/currency.yml
index 498c9d2..998eab7 100644
--- a/conf/repo/currency.yml
+++ b/conf/repo/currency.yml
@@ -8,10 +8,11 @@ currency:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Currency
-  default_branch: "16.0"
+  default_branch: "18.0"
   name:
-    "Odoo currency related addons (crypto currencies, rate conversion, integrations
-    with third party applications,...)"
+    Odoo currency related addons (crypto currencies, rate conversion, integrations
+    with third party applications,...)
   psc: currency-maintainers
   psc_rep: accounting-maintainers-psc-representative
diff --git a/conf/repo/data.yml b/conf/repo/data.yml
index 327ec6c..3ec25a3 100644
--- a/conf/repo/data.yml
+++ b/conf/repo/data.yml
@@ -10,8 +10,9 @@ data-protection:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Data
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Data protection
   psc: data-protection-maintainers
   psc_rep: data-protection-maintainers-psc-representative
diff --git a/conf/repo/ddmrp.yml b/conf/repo/ddmrp.yml
index b167365..98ea964 100644
--- a/conf/repo/ddmrp.yml
+++ b/conf/repo/ddmrp.yml
@@ -7,8 +7,9 @@ ddmrp:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Ddmrp
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Ddmrp
   psc: ddmrp-maintainers
   psc_rep: ddmrp-maintainers-psc-representative
diff --git a/conf/repo/delivery.yml b/conf/repo/delivery.yml
index 88374ee..6868584 100644
--- a/conf/repo/delivery.yml
+++ b/conf/repo/delivery.yml
@@ -12,8 +12,9 @@ delivery-carrier:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Delivery
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo carriers and deliveries management
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
diff --git a/conf/repo/department.yml b/conf/repo/department.yml
index 46214fb..02f486f 100644
--- a/conf/repo/department.yml
+++ b/conf/repo/department.yml
@@ -7,8 +7,9 @@ department:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Department
-  default_branch: "8.0"
+  default_branch: "18.0"
   name: "[deprecated since 9.0] odoo department segregation and management"
   psc: human-resources-maintainers
   psc_rep: human-resources-maintainers-psc-representative
diff --git a/conf/repo/dms.yml b/conf/repo/dms.yml
index ab22fa1..93b970a 100644
--- a/conf/repo/dms.yml
+++ b/conf/repo/dms.yml
@@ -6,8 +6,9 @@ dms:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Dms
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Odoo modules for a document management system
   psc: document-maintainers
   psc_rep: document-maintainers-psc-representative
diff --git a/conf/repo/donation.yml b/conf/repo/donation.yml
index d6afad0..0d7b5d2 100644
--- a/conf/repo/donation.yml
+++ b/conf/repo/donation.yml
@@ -10,8 +10,9 @@ donation:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Donation
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Donation
   psc: donation-maintainers
   psc_rep: donation-maintainers-psc-representative
diff --git a/conf/repo/dotnet.yml b/conf/repo/dotnet.yml
index b41f678..d195093 100644
--- a/conf/repo/dotnet.yml
+++ b/conf/repo/dotnet.yml
@@ -10,8 +10,9 @@ dotnet:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Dotnet
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: This repository holds all addons written in dotnet
   psc: dotnet-maintainers
   psc_rep: dotnet-maintainers-psc-representative
diff --git a/conf/repo/e-commerce.yml b/conf/repo/e-commerce.yml
index 525c4fa..2083274 100644
--- a/conf/repo/e-commerce.yml
+++ b/conf/repo/e-commerce.yml
@@ -11,8 +11,9 @@ e-commerce:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: E-commerce
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Odoo e Commerce server automation addons
   psc: e-commerce-maintainers
   psc_rep: e-commerce-maintainers-psc-representative
diff --git a/conf/repo/e-learning.yml b/conf/repo/e-learning.yml
index 879f3ad..1b40826 100644
--- a/conf/repo/e-learning.yml
+++ b/conf/repo/e-learning.yml
@@ -3,8 +3,9 @@ e-learning:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Event
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: E-learning addons
   psc: e-learning-maintainers
   psc_rep: e-learning-maintainers-psc-representative
diff --git a/conf/repo/edi.yml b/conf/repo/edi.yml
index d3b2f5d..1bceabc 100644
--- a/conf/repo/edi.yml
+++ b/conf/repo/edi.yml
@@ -10,8 +10,9 @@ edi:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Edi
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Edi
   psc: edi-maintainers
   psc_rep: edi-maintainers-psc-representative
@@ -21,8 +22,9 @@ edi-framework:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Edi
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Edi Framework
   psc: edi-framework-maintainers
   psc_rep: edi-framework-maintainers-psc-representative
diff --git a/conf/repo/event.yml b/conf/repo/event.yml
index 3cd81d9..18f7669 100644
--- a/conf/repo/event.yml
+++ b/conf/repo/event.yml
@@ -10,8 +10,9 @@ event:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Event
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Event management addons
   psc: crm-sales-marketing-maintainers
   psc_rep: crm-sales-marketing-maintainers-psc-representative
diff --git a/conf/repo/field.yml b/conf/repo/field.yml
index b3ab783..914db3c 100644
--- a/conf/repo/field.yml
+++ b/conf/repo/field.yml
@@ -7,8 +7,9 @@ field-service:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Field
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Field service management
   psc: field-service-maintainers
   psc_rep: field-service-maintainers-psc-representative
diff --git a/conf/repo/fleet.yml b/conf/repo/fleet.yml
index be71ebc..4d84016 100644
--- a/conf/repo/fleet.yml
+++ b/conf/repo/fleet.yml
@@ -6,8 +6,9 @@ fleet:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Fleet
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo fleet management modules
   psc: fleet-maintainers
   psc_rep: fleet-maintainers-psc-representative
diff --git a/conf/repo/geospatial.yml b/conf/repo/geospatial.yml
index 219d2bd..ddf26d8 100644
--- a/conf/repo/geospatial.yml
+++ b/conf/repo/geospatial.yml
@@ -12,8 +12,9 @@ geospatial:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Geospatial
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo and gis
   psc: geospatial-maintainers
   psc_rep: geospatial-maintainers-psc-representative
diff --git a/conf/repo/helpdesk.yml b/conf/repo/helpdesk.yml
index ed09632..e8c19bf 100644
--- a/conf/repo/helpdesk.yml
+++ b/conf/repo/helpdesk.yml
@@ -8,8 +8,9 @@ helpdesk:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Helpdesk
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo modules for managing a helpdesk system
   psc: helpdesk-maintainers
   psc_rep: helpdesk-maintainers-psc-representative
diff --git a/conf/repo/hr.yml b/conf/repo/hr.yml
index 43a2879..2880763 100644
--- a/conf/repo/hr.yml
+++ b/conf/repo/hr.yml
@@ -12,8 +12,9 @@ hr:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Hr
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Odoo human resources addons
   psc: human-resources-maintainers
   psc_rep: human-resources-maintainers-psc-representative
@@ -24,8 +25,9 @@ hr-attendance:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Hr
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Hr attendance oca modules for odoo
   psc: human-resources-maintainers
   psc_rep: human-resources-maintainers-psc-representative
@@ -36,8 +38,9 @@ hr-expense:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Hr
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Human resources expenses oca modules for odoo
   psc: human-resources-maintainers
   psc_rep: human-resources-maintainers-psc-representative
@@ -48,8 +51,9 @@ hr-holidays:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Hr
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Human resources holidays oca modules for odoo
   psc: human-resources-maintainers
   psc_rep: human-resources-maintainers-psc-representative
diff --git a/conf/repo/infrastructure.yml b/conf/repo/infrastructure.yml
index 9a19409..587d663 100644
--- a/conf/repo/infrastructure.yml
+++ b/conf/repo/infrastructure.yml
@@ -10,8 +10,9 @@ infrastructure:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Infrastructure
-  default_branch: "13.0"
+  default_branch: "18.0"
   name:
     Odoo modules related to the management of domain name server services within
     network infrastructure
diff --git a/conf/repo/interface.yml b/conf/repo/interface.yml
index c868016..548e8f6 100644
--- a/conf/repo/interface.yml
+++ b/conf/repo/interface.yml
@@ -9,8 +9,9 @@ interface-github:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Interface
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Tools to interact with github from odoo
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
diff --git a/conf/repo/intrastat.yml b/conf/repo/intrastat.yml
index 7468e10..c3787ef 100644
--- a/conf/repo/intrastat.yml
+++ b/conf/repo/intrastat.yml
@@ -10,8 +10,9 @@ intrastat-extrastat:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Intrastat
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Intrastat Extrastat
   psc: intrastat-maintainers
   psc_rep: intrastat-maintainers-psc-representative
diff --git a/conf/repo/iot.yml b/conf/repo/iot.yml
index e9b2eb5..08e939f 100644
--- a/conf/repo/iot.yml
+++ b/conf/repo/iot.yml
@@ -7,8 +7,9 @@ iot:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Iot
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Internet of things (iot)
   psc: iot-maintainers
   psc_rep: iot-maintainers-psc-representative
diff --git a/conf/repo/knowledge.yml b/conf/repo/knowledge.yml
index 035f2be..2ac9314 100644
--- a/conf/repo/knowledge.yml
+++ b/conf/repo/knowledge.yml
@@ -12,8 +12,9 @@ knowledge:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Knowledge
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo document & knowledge management
   psc: document-maintainers
   psc_rep: document-maintainers-psc-representative
diff --git a/conf/repo/l10n.yml b/conf/repo/l10n.yml
index 0e4c44c..433e81e 100644
--- a/conf/repo/l10n.yml
+++ b/conf/repo/l10n.yml
@@ -11,8 +11,9 @@ l10n-argentina:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo modules for argentina
   psc: local-argentina-maintainers
   psc_rep: local-argentina-maintainers-psc-representative
@@ -26,8 +27,9 @@ l10n-austria:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "10.0"
+  default_branch: "18.0"
   name: Odoo austria localization
   psc: local-austria-maintainers
   psc_rep: local-austria-maintainers-psc-representative
@@ -40,8 +42,9 @@ l10n-belarus:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: L10n Belarus
   psc: local-belarus-maintainers
   psc_rep: local-belarus-maintainers-psc-representative
@@ -58,8 +61,9 @@ l10n-belgium:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: L10n Belgium
   psc: local-belgium-maintainers
   psc_rep: local-belgium-maintainers-psc-representative
@@ -78,8 +82,9 @@ l10n-brazil:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: "Localiza\xE7\xE3o brasileira oficial do odoo."
   psc: local-brazil-maintainers
   psc_rep: local-brazil-maintainers-psc-representative
@@ -87,8 +92,9 @@ l10n-bulgaria:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo bulgarian localization
   psc: local-bulgaria-maintainers
   psc_rep: local-bulgaria-maintainers-psc-representative
@@ -98,8 +104,9 @@ l10n-cambodia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo cambodian localization
   psc: local-cambodia-maintainers
   psc_rep: local-cambodia-maintainers-psc-representative
@@ -117,8 +124,9 @@ l10n-canada:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo modules for canada
   psc: local-canada-maintainers
   psc_rep: local-canada-maintainers-psc-representative
@@ -134,8 +142,9 @@ l10n-chile:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Odoo chilean localization
   psc: local-chile-maintainers
   psc_rep: local-chile-maintainers-psc-representative
@@ -150,8 +159,9 @@ l10n-china:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Chinese localization of odoo
   psc: local-china-maintainers
   psc_rep: local-china-maintainers-psc-representative
@@ -166,8 +176,9 @@ l10n-colombia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo modules for colombia
   psc: local-colombia-maintainers
   psc_rep: local-colombia-maintainers-psc-representative
@@ -182,8 +193,9 @@ l10n-costa-rica:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Odoo modules for costa Rica
   psc: local-costa-rica-maintainers
   psc_rep: local-costa-rica-maintainers-psc-representative
@@ -198,8 +210,9 @@ l10n-croatia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo croatian localization
   psc: local-croatia-maintainers
   psc_rep: local-croatia-maintainers-psc-representative
@@ -215,8 +228,9 @@ l10n-ecuador:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Odoo localization for ecuador
   psc: local-ecuador-maintainers
   psc_rep: local-ecuador-maintainers-psc-representative
@@ -229,8 +243,9 @@ l10n-estonia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: L10n Estonia
   psc: local-estonia-maintainers
   psc_rep: local-estonia-maintainers-psc-representative
@@ -247,8 +262,9 @@ l10n-ethiopia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Ethiopian localization project
   psc: local-ethiopia-maintainers
   psc_rep: local-ethiopia-maintainers-psc-representative
@@ -264,8 +280,9 @@ l10n-finland:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: L10n Finland
   psc: local-finland-maintainers-project-leader
   psc_rep: local-finland-maintainers-psc-representative
@@ -282,8 +299,9 @@ l10n-france:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: France localization for odoo
   psc: local-france-maintainers
   psc_rep: local-france-maintainers-psc-representative
@@ -300,8 +318,9 @@ l10n-germany:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: L10n Germany
   psc: local-germany-maintainers-project-leader
   psc_rep: local-germany-maintainers-psc-representative
@@ -315,8 +334,9 @@ l10n-greece:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo greek localization
   psc: local-greece-maintainers
   psc_rep: local-greece-maintainers-psc-representative
@@ -332,8 +352,9 @@ l10n-india:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo localization for india
   psc: local-india-maintainers
   psc_rep: local-india-maintainers-psc-representative
@@ -346,8 +367,9 @@ l10n-indonesia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "8.0"
+  default_branch: "18.0"
   name: Indonesian localization project
   psc: local-indonesia-maintainers
   psc_rep: local-indonesia-maintainers-psc-representative
@@ -363,8 +385,9 @@ l10n-iran:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Odoo localization for iran
   psc: local-iran-maintainers
   psc_rep: local-iran-maintainers-psc-representative
@@ -379,8 +402,9 @@ l10n-ireland:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo localization for ireland
   psc: local-ireland-maintainers
   psc_rep: local-ireland-maintainers-psc-representative
@@ -400,8 +424,9 @@ l10n-italy:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo italian localization
   psc: local-italy-maintainers
   psc_rep: local-italy-maintainers-psc-representative
@@ -414,8 +439,9 @@ l10n-japan:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: L10n Japan
   psc: local-japan-maintainers
   psc_rep: local-japan-maintainers-psc-representative
@@ -434,8 +460,9 @@ l10n-luxemburg:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: L10n Luxemburg
   psc: local-luxemburg-maintainers
   psc_rep: local-luxemburg-maintainers-psc-representative
@@ -446,8 +473,9 @@ l10n-macedonia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Odoo macedonian localization
   psc: local-macedonia-maintainers
   psc_rep: local-macedonia-maintainers-psc-representative
@@ -462,8 +490,9 @@ l10n-mexico:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "13.0"
+  default_branch: "18.0"
   name: Mexican localization.
   psc: local-mexico-maintainers
   psc_rep: local-mexico-maintainers-psc-representative
@@ -479,8 +508,9 @@ l10n-morocco:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Moroccan localization
   psc: local-morocco-maintainers
   psc_rep: local-morocco-maintainers-psc-representative
@@ -497,8 +527,9 @@ l10n-netherlands:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo dutch localization
   psc: local-netherlands-maintainers
   psc_rep: local-netherlands-maintainers-psc-representative
@@ -513,8 +544,9 @@ l10n-norway:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: The norwegian localization for odoo
   psc: local-norway-maintainers
   psc_rep: local-norway-maintainers-psc-representative
@@ -531,8 +563,9 @@ l10n-peru:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Peruvian localization
   psc: local-peru-maintainers
   psc_rep: local-peru-maintainers-psc-representative
@@ -545,8 +578,9 @@ l10n-poland:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo polish localization
   psc: local-poland-maintainers
   psc_rep: local-poland-maintainers-psc-representative
@@ -564,8 +598,9 @@ l10n-portugal:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo portuguese localization
   psc: local-portugal-maintainers
   psc_rep: local-portugal-maintainers-psc-representative
@@ -582,8 +617,9 @@ l10n-romania:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Romanian localization for odoo
   psc: local-romania-maintainers
   psc_rep: local-romania-maintainers-psc-representative
@@ -593,8 +629,9 @@ l10n-russia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: L10n Russia
   psc: local-russia-maintainers
   psc_rep: local-russia-maintainers-psc-representative
@@ -606,8 +643,9 @@ l10n-slovenia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "10.0"
+  default_branch: "18.0"
   name: Slovenian localization project
   psc: local-slovenia-maintainers
   psc_rep: local-slovenia-maintainers-psc-representative
@@ -628,8 +666,9 @@ l10n-spain:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Odoo spain localization
   psc: local-spain-maintainers
   psc_rep: local-spain-maintainers-psc-representative
@@ -649,8 +688,9 @@ l10n-switzerland:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo swiss localization
   psc: local-switzerland-maintainers
   psc_rep: local-switzerland-maintainers-psc-representative
@@ -665,8 +705,9 @@ l10n-taiwan:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Taiwanese localization
   psc: board
   psc_rep: board
@@ -680,8 +721,9 @@ l10n-thailand:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Thai localization
   psc: local-thailand-maintainers
   psc_rep: local-thailand-maintainers-psc-representative
@@ -697,8 +739,9 @@ l10n-turkey:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Turkish localization project
   psc: local-turkey-maintainers
   psc_rep: local-turkey-maintainers-psc-representative
@@ -710,8 +753,9 @@ l10n-ukraine:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Ukrainian localization
   psc: local-ukraine-maintainers
   psc_rep: local-ukraine-maintainers-psc-representative
@@ -727,8 +771,9 @@ l10n-united-kingdom:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo localization for united kingdom
   psc: local-uk-maintainers
   psc_rep: board
@@ -741,8 +786,9 @@ l10n-uruguay:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Odoo localization for uruguay
   psc: local-uruguay-maintainers
   psc_rep: local-uruguay-maintainers-psc-representative
@@ -759,8 +805,9 @@ l10n-usa:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Us localization of odoo
   psc: local-usa-maintainers
   psc_rep: local-usa-maintainers-psc-representative
@@ -776,8 +823,9 @@ l10n-venezuela:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo modules for venezuela
   psc: local-venezuela-maintainers
   psc_rep: local-venezuela-maintainers-psc-representative
@@ -792,8 +840,9 @@ l10n-vietnam:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: L10n Vietnam
   psc: local-vietnam-maintainers
   psc_rep: local-vietnam-maintainers-psc-representative
diff --git a/conf/repo/logistics.yml b/conf/repo/logistics.yml
index be0350e..2b969d5 100644
--- a/conf/repo/logistics.yml
+++ b/conf/repo/logistics.yml
@@ -1,8 +1,9 @@
 stock-logistics-availability:
   branches:
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name:
     This repository contains modules to provide more information about product
     stock availability in terms of quantities (immediately usable, potential, unreserved
@@ -22,24 +23,27 @@ stock-logistics-barcode:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Stock Logistics Barcode
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
 stock-logistics-interfaces:
   branches:
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Stock Logistics Interfaces
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
 stock-logistics-orderpoint:
   branches:
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name:
     This repository contains modules to extend reordering rules (available on
     warehouses locations) functionalities.
@@ -58,16 +62,18 @@ stock-logistics-reporting:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Provides odoo logistics reporting modules
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
 stock-logistics-request:
   branches:
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name:
     This repository contains modules to provide another way of creating stock
     movements. provided as a dedicated application, users will be able to create their
@@ -87,8 +93,9 @@ stock-logistics-tracking:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: This repository contains modules around stock packages management
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
@@ -104,8 +111,9 @@ stock-logistics-transport:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: "Transport management in odoo "
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
@@ -122,8 +130,9 @@ stock-logistics-warehouse:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo warehouse management addons
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
@@ -140,8 +149,9 @@ stock-logistics-workflow:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo stock, workflow and organization
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
@@ -150,8 +160,9 @@ stock-weighing:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Stock
-  default_branch: "15.0"
+  default_branch: "18.0"
   name: Shopfloor for weighing operations
   psc: stock-weighing-maintainers
   psc_rep: stock-weighing-maintainers-psc-representative
@@ -163,8 +174,9 @@ wms:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Wms
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Warehouse management system for advance logistic with odoo
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
diff --git a/conf/repo/maintenance.yml b/conf/repo/maintenance.yml
index c4448e3..d7cb033 100644
--- a/conf/repo/maintenance.yml
+++ b/conf/repo/maintenance.yml
@@ -8,8 +8,9 @@ maintenance:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Maintenance
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo modules for businesses that implies maintenance tasks
   psc: maintenance-maintainers
   psc_rep: maintenance-maintainers-psc-representative
diff --git a/conf/repo/management.yml b/conf/repo/management.yml
index c4e66bb..7180d0f 100644
--- a/conf/repo/management.yml
+++ b/conf/repo/management.yml
@@ -12,8 +12,9 @@ management-system:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Management
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo for management systems (iso, iec, bs)
   psc: management-systems-maintainers
   psc_rep: management-systems-maintainers-psc-representative
diff --git a/conf/repo/manufacture.yml b/conf/repo/manufacture.yml
index 86d1a4f..624770b 100644
--- a/conf/repo/manufacture.yml
+++ b/conf/repo/manufacture.yml
@@ -12,8 +12,9 @@ manufacture:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Manufacture
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo manufacturing addons
   psc: manufacturing-maintainers
   psc_rep: manufacturing-maintainers-psc-representative
@@ -30,8 +31,9 @@ manufacture-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Manufacture
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Manufacture Reporting
   psc: manufacturing-maintainers
   psc_rep: manufacturing-maintainers-psc-representative
diff --git a/conf/repo/margin.yml b/conf/repo/margin.yml
index 866061a..2deeebc 100644
--- a/conf/repo/margin.yml
+++ b/conf/repo/margin.yml
@@ -12,8 +12,9 @@ margin-analysis:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Margin
-  default_branch: "15.0"
+  default_branch: "18.0"
   name: Odoo financial controlling (margin, costs, ...)
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
diff --git a/conf/repo/mis.yml b/conf/repo/mis.yml
index ca9f14d..dc15d17 100644
--- a/conf/repo/mis.yml
+++ b/conf/repo/mis.yml
@@ -11,8 +11,9 @@ mis-builder:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Mis
-  default_branch: "16.0"
+  default_branch: "18.0"
   name:
     "Management information system reports for odoo: easily build super fast,
     beautiful, custom reports such as p&l, balance sheets and more."
@@ -30,8 +31,9 @@ mis-builder-contrib:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Mis
-  default_branch: "16.0"
+  default_branch: "18.0"
   name:
     Modules that provide additional features on top of mis builder. a kind of
     incubator for mis builder features that may land in the core in the future.
diff --git a/conf/repo/multi.yml b/conf/repo/multi.yml
index df59e90..6d361f4 100644
--- a/conf/repo/multi.yml
+++ b/conf/repo/multi.yml
@@ -12,8 +12,9 @@ multi-company:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Multi
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Multi Company
   psc: intercompany-maintainers
   psc_rep: intercompany-maintainers-psc-representative
diff --git a/conf/repo/oca.yml b/conf/repo/oca.yml
index 1d60f12..db0d018 100644
--- a/conf/repo/oca.yml
+++ b/conf/repo/oca.yml
@@ -25,6 +25,7 @@ oca-custom:
   name: Custom module for oca instance
   psc: board
   psc_rep: board
+  manual_branch_mgmt: true
 oca-decorators:
   branches: []
   category: Oca
diff --git a/conf/repo/odoo-community.yml b/conf/repo/odoo-community.yml
index de593fb..1115e48 100644
--- a/conf/repo/odoo-community.yml
+++ b/conf/repo/odoo-community.yml
@@ -21,8 +21,9 @@ odoo-pim:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Odoo
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo Pim
   psc: product-maintainers
   psc_rep: product-maintainers-psc-representative
diff --git a/conf/repo/openupgrade.yml b/conf/repo/openupgrade.yml
index 651f90d..3bae605 100644
--- a/conf/repo/openupgrade.yml
+++ b/conf/repo/openupgrade.yml
@@ -14,8 +14,9 @@ OpenUpgrade:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Openupgrade
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Open source upgrade path for odoo/openerp
   psc: openupgrade-maintainers
   psc_rep: openupgrade-maintainers-psc-representative
diff --git a/conf/repo/operating.yml b/conf/repo/operating.yml
index 7cb5bee..102b4bb 100644
--- a/conf/repo/operating.yml
+++ b/conf/repo/operating.yml
@@ -11,8 +11,9 @@ operating-unit:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Operating
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Manage operating units in odoo
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
diff --git a/conf/repo/partner.yml b/conf/repo/partner.yml
index 9b6e910..86c2d90 100644
--- a/conf/repo/partner.yml
+++ b/conf/repo/partner.yml
@@ -12,8 +12,9 @@ partner-contact:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Partner
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo partner and contact related addons
   psc: crm-sales-marketing-maintainers
   psc_rep: crm-sales-marketing-maintainers-psc-representative
diff --git a/conf/repo/payroll.yml b/conf/repo/payroll.yml
index d98b2f2..a5a3c9c 100644
--- a/conf/repo/payroll.yml
+++ b/conf/repo/payroll.yml
@@ -5,8 +5,9 @@ payroll:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Payroll
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo modules for payroll management
   psc: human-resources-maintainers
   psc_rep: human-resources-maintainers-psc-representative
diff --git a/conf/repo/pim.yml b/conf/repo/pim.yml
index d6785e6..08616bd 100644
--- a/conf/repo/pim.yml
+++ b/conf/repo/pim.yml
@@ -6,8 +6,9 @@ odoo-pim:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Odoo
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo Pim
   psc: product-maintainers
   psc_rep: product-maintainers-psc-representative
diff --git a/conf/repo/pms.yml b/conf/repo/pms.yml
index cbba533..da845ed 100644
--- a/conf/repo/pms.yml
+++ b/conf/repo/pms.yml
@@ -4,8 +4,9 @@ pms:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Pms
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Property management system on odoo
   psc: pms-maintainers
   psc_rep: pms-maintainers-psc-representative
diff --git a/conf/repo/pos.yml b/conf/repo/pos.yml
index 910100c..0b67eea 100644
--- a/conf/repo/pos.yml
+++ b/conf/repo/pos.yml
@@ -11,8 +11,9 @@ pos:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Pos
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Pos
   psc: pos-maintainers
   psc_rep: pos-maintainers-psc-representative
diff --git a/conf/repo/product.yml b/conf/repo/product.yml
index 3567eac..2edfc30 100644
--- a/conf/repo/product.yml
+++ b/conf/repo/product.yml
@@ -12,8 +12,9 @@ product-attribute:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo product attribute
   psc: product-maintainers
   psc_rep: product-maintainers-psc-representative
@@ -23,8 +24,9 @@ product-configurator:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
-  default_branch: "14.0"
+  default_branch: "18.0"
   name:
     Advanced product configurator (from the original pledra project https://github.com/pledra/odoo
     Product Configurator)
@@ -44,8 +46,9 @@ product-kitting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo kitting addons
   psc: product-maintainers
   psc_rep: product-maintainers-psc-representative
@@ -57,8 +60,9 @@ product-pack:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo modules related to product packs
   psc: product-maintainers
   psc_rep: product-maintainers-psc-representative
@@ -76,8 +80,9 @@ product-variant:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Product Variant
   psc: product-maintainers
   psc_rep: product-maintainers-psc-representative
diff --git a/conf/repo/program.yml b/conf/repo/program.yml
index 5e37f49..8ee1b00 100644
--- a/conf/repo/program.yml
+++ b/conf/repo/program.yml
@@ -5,8 +5,9 @@ program:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Program
-  default_branch: "7.0"
+  default_branch: "18.0"
   name: Program
   psc: project-service-maintainers
   psc_rep: project-service-maintainers-psc-representative
diff --git a/conf/repo/project.yml b/conf/repo/project.yml
index d16af6f..d1eb19b 100644
--- a/conf/repo/project.yml
+++ b/conf/repo/project.yml
@@ -12,8 +12,9 @@ project:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Project
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Odoo project management and services company addons
   psc: project-service-maintainers
   psc_rep: project-service-maintainers-psc-representative
@@ -27,8 +28,9 @@ project-agile:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Project
-  default_branch: "10.0"
+  default_branch: "18.0"
   name: Project Agile
   psc: project-agile-maintainers
   psc_rep: board
@@ -46,8 +48,9 @@ project-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Project
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Project Reporting
   psc: project-service-maintainers
   psc_rep: project-service-maintainers-psc-representative
diff --git a/conf/repo/purchase.yml b/conf/repo/purchase.yml
index 0450cd6..45f5da9 100644
--- a/conf/repo/purchase.yml
+++ b/conf/repo/purchase.yml
@@ -12,8 +12,9 @@ purchase-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Purchase
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Purchase Reporting
   psc: procurement-purchase-maintainers
   psc_rep: procurement-purchase-maintainers-psc-representative
@@ -31,8 +32,9 @@ purchase-workflow:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Purchase
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo purchases, workflow and organization
   psc: procurement-purchase-maintainers
   psc_rep: procurement-purchase-maintainers-psc-representative
diff --git a/conf/repo/pwa.yml b/conf/repo/pwa.yml
index 28ebf45..f256ce3 100644
--- a/conf/repo/pwa.yml
+++ b/conf/repo/pwa.yml
@@ -2,8 +2,9 @@ pwa-builder:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Pwa
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Pwa Builder
   psc: board
   psc_rep: board
diff --git a/conf/repo/queue.yml b/conf/repo/queue.yml
index ca6a8e1..762dbb6 100644
--- a/conf/repo/queue.yml
+++ b/conf/repo/queue.yml
@@ -8,8 +8,9 @@ queue:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Queue
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Asynchronous job queue
   psc: connector-maintainers
   psc_rep: connector-maintainers-psc-representative
diff --git a/conf/repo/repair.yml b/conf/repo/repair.yml
index 1b987f9..bef386c 100644
--- a/conf/repo/repair.yml
+++ b/conf/repo/repair.yml
@@ -3,8 +3,9 @@ repair:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Repair
-  default_branch: "15.0"
+  default_branch: "18.0"
   name: Repair
   psc: manufacturing-maintainers
   psc_rep: manufacturing-maintainers-psc-representative
diff --git a/conf/repo/reporting.yml b/conf/repo/reporting.yml
index 36a6286..000201d 100644
--- a/conf/repo/reporting.yml
+++ b/conf/repo/reporting.yml
@@ -1,4 +1,4 @@
-reporting-engine:
+report-print-send:
   branches:
     - "6.1"
     - "7.0"
@@ -12,12 +12,13 @@ reporting-engine:
     - "15.0"
     - "16.0"
     - "17.0"
-  category: Reporting
-  default_branch: "16.0"
-  name: Odoo alternative reporting engine
+    - "18.0"
+  category: Report
+  default_branch: "18.0"
+  name: Odoo printing services and printer related addons
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
-report-print-send:
+reporting-engine:
   branches:
     - "6.1"
     - "7.0"
@@ -31,8 +32,9 @@ report-print-send:
     - "15.0"
     - "16.0"
     - "17.0"
-  category: Report
-  default_branch: "14.0"
-  name: Odoo printing services and printer related addons
+    - "18.0"
+  category: Reporting
+  default_branch: "18.0"
+  name: Odoo alternative reporting engine
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
diff --git a/conf/repo/resource.yml b/conf/repo/resource.yml
index 2c43aa9..12f28d6 100644
--- a/conf/repo/resource.yml
+++ b/conf/repo/resource.yml
@@ -4,8 +4,9 @@ resource:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Resource
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Resource
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
diff --git a/conf/repo/rest.yml b/conf/repo/rest.yml
index f39ba5e..e99b86d 100644
--- a/conf/repo/rest.yml
+++ b/conf/repo/rest.yml
@@ -2,8 +2,9 @@ rest-api:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Rest
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Rest Api
   psc: board
   psc_rep: board
@@ -17,8 +18,9 @@ rest-framework:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Rest
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Rest Framework
   psc: rest-framework-maintainers
   psc_rep: rest-framework-maintainers-psc-representative
diff --git a/conf/repo/rma.yml b/conf/repo/rma.yml
index a3f69e1..4117a1d 100644
--- a/conf/repo/rma.yml
+++ b/conf/repo/rma.yml
@@ -13,8 +13,9 @@ rma:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Rma
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo for return merchandise authorization (rma)
   psc: logistics-maintainers
   psc_rep: logistics-maintainers-psc-representative
diff --git a/conf/repo/role.yml b/conf/repo/role.yml
index 47c93d0..d6999b7 100644
--- a/conf/repo/role.yml
+++ b/conf/repo/role.yml
@@ -4,8 +4,9 @@ role-policy:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Role
-  default_branch: "13.0"
+  default_branch: "18.0"
   name: Role Policy
   psc: role-policy-maintainers
   psc_rep: role-policy-maintainers-psc-representative
diff --git a/conf/repo/runbot.yml b/conf/repo/runbot.yml
index fc697cd..2987a9f 100644
--- a/conf/repo/runbot.yml
+++ b/conf/repo/runbot.yml
@@ -10,8 +10,9 @@ runbot-addons:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Runbot
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo runbot custom features to be used by community.
   psc: board
   psc_rep: board
diff --git a/conf/repo/sale.yml b/conf/repo/sale.yml
index 41bd537..3a779ee 100644
--- a/conf/repo/sale.yml
+++ b/conf/repo/sale.yml
@@ -2,8 +2,9 @@ sale-channel:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Sale Channel
   psc: board
   psc_rep: board
@@ -21,8 +22,9 @@ sale-financial:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo sale and financial related addons
   psc: crm-sales-marketing-maintainers
   psc_rep: crm-sales-marketing-maintainers-psc-representative
@@ -33,8 +35,9 @@ sale-promotion:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Sale Promotion
   psc: crm-sales-marketing-maintainers
   psc_rep: crm-sales-marketing-maintainers-psc-representative
@@ -52,8 +55,9 @@ sale-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Sale Reporting
   psc: crm-sales-marketing-maintainers
   psc_rep: crm-sales-marketing-maintainers-psc-representative
@@ -71,8 +75,9 @@ sale-workflow:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo sales, workflow and organization
   psc: crm-sales-marketing-maintainers
   psc_rep: crm-sales-marketing-maintainers-psc-representative
diff --git a/conf/repo/search.yml b/conf/repo/search.yml
index c980db0..93e93ed 100644
--- a/conf/repo/search.yml
+++ b/conf/repo/search.yml
@@ -7,8 +7,9 @@ search-engine:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Search
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Search Engine
   psc: search-engine-maintainers
   psc_rep: search-engine-maintainers-psc-representative
diff --git a/conf/repo/server.yml b/conf/repo/server.yml
index 291a7f0..f9d33ad 100644
--- a/conf/repo/server.yml
+++ b/conf/repo/server.yml
@@ -10,8 +10,9 @@ server-auth:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Server
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Server Auth
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
@@ -24,8 +25,9 @@ server-backend:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Server
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Server Backend
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
@@ -38,8 +40,9 @@ server-brand:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Server
-  default_branch: "17.0"
+  default_branch: "18.0"
   name: Server Brand
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
@@ -72,8 +75,9 @@ server-tools:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Server
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Tools for odoo administrators to improve some technical features on odoo.
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
@@ -87,8 +91,9 @@ server-ux:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Server
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Server Ux
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
diff --git a/conf/repo/shift.yml b/conf/repo/shift.yml
index 70dca3c..d17a080 100644
--- a/conf/repo/shift.yml
+++ b/conf/repo/shift.yml
@@ -4,8 +4,9 @@ shift-planning:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Shift
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Shift Planning
   psc: cooperative-maintainers
   psc_rep: cooperative-maintainers-psc-representative
diff --git a/conf/repo/sign.yml b/conf/repo/sign.yml
index e88936a..45619ff 100644
--- a/conf/repo/sign.yml
+++ b/conf/repo/sign.yml
@@ -4,8 +4,9 @@ sign:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sign
-  default_branch: "13.0"
+  default_branch: "18.0"
   name: Sign
   psc: document-maintainers
   psc_rep: document-maintainers-psc-representative
diff --git a/conf/repo/social.yml b/conf/repo/social.yml
index 6294df8..79d25ef 100644
--- a/conf/repo/social.yml
+++ b/conf/repo/social.yml
@@ -1,3 +1,13 @@
+automation:
+  branches:
+    - "16.0"
+    - "17.0"
+    - "18.0"
+  category: Social
+  default_branch: "18.0"
+  name: Addons concerning automation processes
+  psc: social-maintainers
+  psc_rep: social-maintainers-psc-representative
 social:
   branches:
     - "8.0"
@@ -10,17 +20,9 @@ social:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Social
-  default_branch: "14.0"
-  name: Addons concerning odoo's social erp features and messaging in general
-  psc: social-maintainers
-  psc_rep: social-maintainers-psc-representative
-automation:
-  branches:
-    - "16.0"
-    - "17.0"
-  category: Social
-  default_branch: "16.0"
-  name: Addons concerning automation processes
+  default_branch: "18.0"
+  name: Addons concerning odoo"s social erp features and messaging in general
   psc: social-maintainers
   psc_rep: social-maintainers-psc-representative
diff --git a/conf/repo/spreadsheet.yml b/conf/repo/spreadsheet.yml
index 9f06cf1..14efead 100644
--- a/conf/repo/spreadsheet.yml
+++ b/conf/repo/spreadsheet.yml
@@ -2,8 +2,9 @@ spreadsheet:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Spreadsheet
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Spreadsheet
   psc: web-maintainers
   psc_rep: web-maintainers-psc-representative
diff --git a/conf/repo/storage.yml b/conf/repo/storage.yml
index 2680089..2ee2e4c 100644
--- a/conf/repo/storage.yml
+++ b/conf/repo/storage.yml
@@ -7,8 +7,9 @@ storage:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Storage
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Storage
   psc: storage-maintainers
   psc_rep: storage-maintainers-psc-representative
diff --git a/conf/repo/survey.yml b/conf/repo/survey.yml
index 40a573f..8d6d2bb 100644
--- a/conf/repo/survey.yml
+++ b/conf/repo/survey.yml
@@ -10,8 +10,9 @@ survey:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Survey
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Survey addons
   psc: crm-sales-marketing-maintainers
   psc_rep: crm-sales-marketing-maintainers-psc-representative
diff --git a/conf/repo/timesheet.yml b/conf/repo/timesheet.yml
index 27d120e..6926f9f 100644
--- a/conf/repo/timesheet.yml
+++ b/conf/repo/timesheet.yml
@@ -12,8 +12,9 @@ timesheet:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Timesheet
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo timesheet management addons
   psc: human-resources-maintainers
   psc_rep: human-resources-maintainers-psc-representative
diff --git a/conf/repo/vertical.yml b/conf/repo/vertical.yml
index 0bb9efe..9527531 100644
--- a/conf/repo/vertical.yml
+++ b/conf/repo/vertical.yml
@@ -10,8 +10,9 @@ vertical-abbey:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Vertical Abbey
   psc: vertical-abbey-maintainers
   psc_rep: vertical-abbey-maintainers-psc-representative
@@ -27,8 +28,9 @@ vertical-agriculture:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Verticalization of odoo for farms and agroindustries
   psc: vertical-agriculture-maintainers
   psc_rep: vertical-agriculture-maintainers-psc-representative
@@ -44,8 +46,9 @@ vertical-association:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo addons for membership related tasks
   psc: vertical-association-maintainers
   psc_rep: vertical-association-maintainers-psc-representative
@@ -61,8 +64,9 @@ vertical-community:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo for communities verticalization
   psc: vertical-community-maintainers-project-leader
   psc_rep: vertical-community-maintainers-psc-representative
@@ -80,8 +84,9 @@ vertical-construction:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo for construction company
   psc: vertical-construction-maintainers
   psc_rep: vertical-construction-maintainers-psc-representative
@@ -91,8 +96,9 @@ vertical-cooperative-supermarket:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Vertical Cooperative Supermarket
   psc: cooperative-maintainers
   psc_rep: cooperative-maintainers-psc-representative
@@ -108,8 +114,9 @@ vertical-edition:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Vertical Edition
   psc: vertical-edition-maintainers
   psc_rep: vertical-edition-maintainers-psc-representative
@@ -126,8 +133,9 @@ vertical-education:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Odoo modules for schools, universities and other education organizations
   psc: vertical-education-maintainers
   psc_rep: vertical-education-maintainers-psc-representative
@@ -145,8 +153,9 @@ vertical-hotel:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "15.0"
+  default_branch: "18.0"
   name: Odoo for hotel management
   psc: vertical-hotel-maintainers
   psc_rep: vertical-hotel-maintainers-psc-representative
@@ -163,8 +172,9 @@ vertical-isp:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Odoo modules for internet service providers
   psc: vertical-isp-maintainers
   psc_rep: vertical-isp-maintainers-psc-representative
@@ -175,8 +185,9 @@ vertical-medical:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Open source healthcare system for odoo
   psc: vertical-medical-maintainers
   psc_rep: vertical-medical-maintainers-psc-representative
@@ -193,9 +204,10 @@ vertical-ngo:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "11.0"
-  name: Odoo for ngo's and humanitarian organization
+  default_branch: "18.0"
+  name: Odoo for ngo"s and humanitarian organization
   psc: vertical-ngo-maintainers
   psc_rep: vertical-ngo-maintainers-psc-representative
 vertical-realestate:
@@ -206,8 +218,9 @@ vertical-realestate:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "13.0"
+  default_branch: "18.0"
   name: Odoo modules for real estate business
   psc: vertical-real-estate-maintainers
   psc_rep: vertical-real-estate-maintainers-psc-representative
@@ -218,8 +231,9 @@ vertical-rental:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Vertical Rental
   psc: vertical-rental-maintainers
   psc_rep: vertical-rental-maintainers-psc-representative
@@ -236,8 +250,9 @@ vertical-travel:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Vertical Travel
   psc: vertical-travel-maintainers
   psc_rep: vertical-travel-maintainers-psc-representative
diff --git a/conf/repo/wallet.yml b/conf/repo/wallet.yml
index 889dc0c..bf83623 100644
--- a/conf/repo/wallet.yml
+++ b/conf/repo/wallet.yml
@@ -4,8 +4,9 @@ wallet:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Wallet
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Wallet
   psc: accounting-maintainers
   psc_rep: accounting-maintainers-psc-representative
diff --git a/conf/repo/web.yml b/conf/repo/web.yml
index bcc1a4f..96cd826 100644
--- a/conf/repo/web.yml
+++ b/conf/repo/web.yml
@@ -12,8 +12,9 @@ web:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Web
-  default_branch: "16.0"
+  default_branch: "18.0"
   name: Odoo web client ui related addons
   psc: web-maintainers
   psc_rep: web-maintainers-psc-representative
@@ -23,8 +24,9 @@ web-api:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Web
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Web Api
   psc: board
   psc_rep: board
@@ -34,8 +36,9 @@ web-api-contrib:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Web
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Web API contrib
   psc: board
   psc_rep: board
diff --git a/conf/repo/webhook.yml b/conf/repo/webhook.yml
index 1dd4573..0e140fd 100644
--- a/conf/repo/webhook.yml
+++ b/conf/repo/webhook.yml
@@ -9,8 +9,9 @@ webhook:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Webhook
-  default_branch: "11.0"
+  default_branch: "18.0"
   name:
     "Modules with community help modules: webhook_* (gitlab, bitbucket... other
     webhook consumer) "
diff --git a/conf/repo/webkit.yml b/conf/repo/webkit.yml
index 810cff4..cb73205 100644
--- a/conf/repo/webkit.yml
+++ b/conf/repo/webkit.yml
@@ -12,8 +12,9 @@ webkit-tools:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Webkit
-  default_branch: "12.0"
+  default_branch: "18.0"
   name: Webkit Tools
   psc: tools-maintainers
   psc_rep: tools-maintainers-psc-representative
diff --git a/conf/repo/website.yml b/conf/repo/website.yml
index 97c8139..0cbb38d 100644
--- a/conf/repo/website.yml
+++ b/conf/repo/website.yml
@@ -10,8 +10,9 @@ website:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Website
-  default_branch: "14.0"
+  default_branch: "18.0"
   name: Odoo website builder addons
   psc: website-maintainers
   psc_rep: website-maintainers-psc-representative
@@ -27,8 +28,9 @@ website-cms:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Website
-  default_branch: "13.0"
+  default_branch: "18.0"
   name: Cms features for odoo website
   psc: website-maintainers
   psc_rep: website-maintainers-psc-representative
@@ -41,8 +43,9 @@ website-themes:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Website
-  default_branch: "11.0"
+  default_branch: "18.0"
   name: Website themes for odoo
   psc: website-maintainers
   psc_rep: website-maintainers-psc-representative