diff --git a/conf/repo/account.yml b/conf/repo/account.yml
index 2365945..7c9a731 100644
--- a/conf/repo/account.yml
+++ b/conf/repo/account.yml
@@ -12,6 +12,7 @@ account-analytic:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "14.0"
   name: Odoo account analytic related addons
@@ -30,6 +31,7 @@ account-budgeting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "12.0"
   name: Account Budgeting
@@ -49,6 +51,7 @@ account-closing:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "14.0"
   name: Odoo accountant closing tools
@@ -68,6 +71,7 @@ account-consolidation:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "12.0"
   name: Odoo account consolidation addons
@@ -88,6 +92,7 @@ account-financial-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "16.0"
   name: Financial reports for odoo
@@ -107,6 +112,7 @@ account-financial-tools:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "16.0"
   name: Odoo accountant financial tools and utils
@@ -126,6 +132,7 @@ account-fiscal-rule:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "14.0"
   name: Odoo taxes & fiscal rules management
@@ -145,6 +152,7 @@ account-invoice-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "14.0"
   name: Odoo invoicing reports
@@ -164,6 +172,7 @@ account-invoicing:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "14.0"
   name: Odoo invoicing extension addons
@@ -183,6 +192,7 @@ account-payment:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "14.0"
   name: Project supervised by the banking psc
@@ -202,6 +212,7 @@ account-reconcile:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Account
   default_branch: "17.0"
   name: Odoo account reconciliation modules (statements, data completion...)
diff --git a/conf/repo/agreement.yml b/conf/repo/agreement.yml
index b395ad6..bc9da93 100644
--- a/conf/repo/agreement.yml
+++ b/conf/repo/agreement.yml
@@ -3,6 +3,7 @@ agreement:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Agreement
   default_branch: "15.0"
   name: Agreement
diff --git a/conf/repo/apps.yml b/conf/repo/apps.yml
index 0892883..e11620a 100644
--- a/conf/repo/apps.yml
+++ b/conf/repo/apps.yml
@@ -8,6 +8,7 @@ apps-store:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Apps
   default_branch: "15.0"
   name: Oca apps store module repository
diff --git a/conf/repo/bank.yml b/conf/repo/bank.yml
index d313f13..6513c02 100644
--- a/conf/repo/bank.yml
+++ b/conf/repo/bank.yml
@@ -14,6 +14,7 @@ bank-payment:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Bank
   default_branch: "16.0"
   name: Odoo electronic payment
@@ -32,6 +33,7 @@ bank-statement-import:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Bank
   default_branch: "16.0"
   name: Bank import addons
diff --git a/conf/repo/brand.yml b/conf/repo/brand.yml
index 3b5bea7..53fa414 100644
--- a/conf/repo/brand.yml
+++ b/conf/repo/brand.yml
@@ -6,6 +6,7 @@ brand:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Brand
   default_branch: "16.0"
   name: Manage brands for products and companies
diff --git a/conf/repo/business.yml b/conf/repo/business.yml
index 17a7f52..77f06e3 100644
--- a/conf/repo/business.yml
+++ b/conf/repo/business.yml
@@ -10,6 +10,7 @@ business-requirement:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Business
   default_branch: "14.0"
   name: Business requirements management via odoo
diff --git a/conf/repo/calendar.yml b/conf/repo/calendar.yml
index 3f51f6a..30a5d9c 100644
--- a/conf/repo/calendar.yml
+++ b/conf/repo/calendar.yml
@@ -9,6 +9,7 @@ calendar:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Calendar
   default_branch: "14.0"
   name: Calendar
diff --git a/conf/repo/commission.yml b/conf/repo/commission.yml
index 34c76d4..ddaec35 100644
--- a/conf/repo/commission.yml
+++ b/conf/repo/commission.yml
@@ -11,6 +11,7 @@ commission:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Commission
   default_branch: "15.0"
   name: Odoo commission management
diff --git a/conf/repo/community.yml b/conf/repo/community.yml
index 953f9f6..49d7255 100644
--- a/conf/repo/community.yml
+++ b/conf/repo/community.yml
@@ -11,6 +11,7 @@ community-data-files:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Community
   default_branch: "17.0"
   name: Community Data Files
diff --git a/conf/repo/connector.yml b/conf/repo/connector.yml
index 2a601e8..9169783 100644
--- a/conf/repo/connector.yml
+++ b/conf/repo/connector.yml
@@ -31,6 +31,7 @@ connector-accountedge:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Odoo modules to connect with account edge (aka myob)
@@ -48,6 +49,7 @@ connector-cmis:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "14.0"
   name: Cmis connector
@@ -66,6 +68,7 @@ connector-ecommerce:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Generic module used on odoo for e Commerce industry
@@ -80,6 +83,7 @@ connector-infor:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Odoo modules to integrate with infor
@@ -113,6 +117,7 @@ connector-jira:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "15.0"
   name: Connector Jira
@@ -128,6 +133,7 @@ connector-lengow:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Connector Lengow
@@ -145,6 +151,7 @@ connector-lims:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Connector Lims
@@ -163,6 +170,7 @@ connector-magento:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Connect odoo with magento
@@ -187,6 +195,7 @@ connector-odoo2odoo:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Connector Odoo2odoo. intercompany process, based on odoo Connector
@@ -206,6 +215,7 @@ connector-prestashop:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "14.0"
   name: Connect odoo with prestashop
@@ -224,6 +234,7 @@ connector-redmine:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Connector redmine (http://redmine.org)
@@ -243,6 +254,7 @@ connector-sage:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Connector with sage
@@ -261,6 +273,7 @@ connector-salesforce:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Connect salesforce with odoo
@@ -276,6 +289,7 @@ connector-spscommerce:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Connector sps commerce
@@ -297,6 +311,7 @@ connector-telephony:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "14.0"
   name: Odoo modules for telephony integration
@@ -314,6 +329,7 @@ connector-woocommerce:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "11.0"
   name: Connector Woocommerce
diff --git a/conf/repo/contract.yml b/conf/repo/contract.yml
index 911f31d..aca92f6 100644
--- a/conf/repo/contract.yml
+++ b/conf/repo/contract.yml
@@ -12,6 +12,7 @@ contract:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Contract
   default_branch: "17.0"
   name: Contract
diff --git a/conf/repo/cooperative.yml b/conf/repo/cooperative.yml
index 4c01b80..1a077f8 100644
--- a/conf/repo/cooperative.yml
+++ b/conf/repo/cooperative.yml
@@ -4,6 +4,7 @@ cooperative:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Cooperative
   default_branch: "14.0"
   name: Cooperative
diff --git a/conf/repo/credit.yml b/conf/repo/credit.yml
index 38cd72c..9fe5a2a 100644
--- a/conf/repo/credit.yml
+++ b/conf/repo/credit.yml
@@ -8,6 +8,7 @@ credit-control:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Credit
   default_branch: "14.0"
   name: Odoo modules for the customer credit control
diff --git a/conf/repo/crm.yml b/conf/repo/crm.yml
index 7e39531..4253aa5 100644
--- a/conf/repo/crm.yml
+++ b/conf/repo/crm.yml
@@ -12,6 +12,7 @@ crm:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Crm
   default_branch: "15.0"
   name: Odoo crm, mail & newsletter advanced features
diff --git a/conf/repo/currency.yml b/conf/repo/currency.yml
index 498c9d2..59b9a51 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"
   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..ddbb7eb 100644
--- a/conf/repo/data.yml
+++ b/conf/repo/data.yml
@@ -10,6 +10,7 @@ data-protection:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Data
   default_branch: "14.0"
   name: Data protection
diff --git a/conf/repo/ddmrp.yml b/conf/repo/ddmrp.yml
index b167365..497cf2d 100644
--- a/conf/repo/ddmrp.yml
+++ b/conf/repo/ddmrp.yml
@@ -7,6 +7,7 @@ ddmrp:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Ddmrp
   default_branch: "14.0"
   name: Ddmrp
diff --git a/conf/repo/delivery.yml b/conf/repo/delivery.yml
index 88374ee..d4f86a8 100644
--- a/conf/repo/delivery.yml
+++ b/conf/repo/delivery.yml
@@ -12,6 +12,7 @@ delivery-carrier:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Delivery
   default_branch: "16.0"
   name: Odoo carriers and deliveries management
diff --git a/conf/repo/department.yml b/conf/repo/department.yml
index 46214fb..376abb8 100644
--- a/conf/repo/department.yml
+++ b/conf/repo/department.yml
@@ -7,6 +7,7 @@ department:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Department
   default_branch: "8.0"
   name: "[deprecated since 9.0] odoo department segregation and management"
diff --git a/conf/repo/dms.yml b/conf/repo/dms.yml
index ab22fa1..145332e 100644
--- a/conf/repo/dms.yml
+++ b/conf/repo/dms.yml
@@ -6,6 +6,7 @@ dms:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Dms
   default_branch: "17.0"
   name: Odoo modules for a document management system
diff --git a/conf/repo/donation.yml b/conf/repo/donation.yml
index d6afad0..efb3ed3 100644
--- a/conf/repo/donation.yml
+++ b/conf/repo/donation.yml
@@ -10,6 +10,7 @@ donation:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Donation
   default_branch: "16.0"
   name: Donation
diff --git a/conf/repo/dotnet.yml b/conf/repo/dotnet.yml
index b41f678..8f4d7ab 100644
--- a/conf/repo/dotnet.yml
+++ b/conf/repo/dotnet.yml
@@ -10,6 +10,7 @@ dotnet:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Dotnet
   default_branch: "11.0"
   name: This repository holds all addons written in dotnet
diff --git a/conf/repo/e-commerce.yml b/conf/repo/e-commerce.yml
index 525c4fa..1ed0a40 100644
--- a/conf/repo/e-commerce.yml
+++ b/conf/repo/e-commerce.yml
@@ -11,6 +11,7 @@ e-commerce:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: E-commerce
   default_branch: "17.0"
   name: Odoo e Commerce server automation addons
diff --git a/conf/repo/e-learning.yml b/conf/repo/e-learning.yml
index 879f3ad..746dc22 100644
--- a/conf/repo/e-learning.yml
+++ b/conf/repo/e-learning.yml
@@ -3,6 +3,7 @@ e-learning:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Event
   default_branch: "17.0"
   name: E-learning addons
diff --git a/conf/repo/edi.yml b/conf/repo/edi.yml
index d3b2f5d..206527a 100644
--- a/conf/repo/edi.yml
+++ b/conf/repo/edi.yml
@@ -10,6 +10,7 @@ edi:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Edi
   default_branch: "14.0"
   name: Edi
@@ -21,6 +22,7 @@ edi-framework:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Edi
   default_branch: "16.0"
   name: Edi Framework
diff --git a/conf/repo/event.yml b/conf/repo/event.yml
index 3cd81d9..cdb2978 100644
--- a/conf/repo/event.yml
+++ b/conf/repo/event.yml
@@ -10,6 +10,7 @@ event:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Event
   default_branch: "14.0"
   name: Event management addons
diff --git a/conf/repo/field.yml b/conf/repo/field.yml
index b3ab783..1339233 100644
--- a/conf/repo/field.yml
+++ b/conf/repo/field.yml
@@ -7,6 +7,7 @@ field-service:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Field
   default_branch: "16.0"
   name: Field service management
diff --git a/conf/repo/fleet.yml b/conf/repo/fleet.yml
index be71ebc..9c26f43 100644
--- a/conf/repo/fleet.yml
+++ b/conf/repo/fleet.yml
@@ -6,6 +6,7 @@ fleet:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Fleet
   default_branch: "16.0"
   name: Odoo fleet management modules
diff --git a/conf/repo/geospatial.yml b/conf/repo/geospatial.yml
index 219d2bd..23f9cfd 100644
--- a/conf/repo/geospatial.yml
+++ b/conf/repo/geospatial.yml
@@ -12,6 +12,7 @@ geospatial:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Geospatial
   default_branch: "14.0"
   name: Odoo and gis
diff --git a/conf/repo/helpdesk.yml b/conf/repo/helpdesk.yml
index ed09632..64bff33 100644
--- a/conf/repo/helpdesk.yml
+++ b/conf/repo/helpdesk.yml
@@ -8,6 +8,7 @@ helpdesk:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Helpdesk
   default_branch: "16.0"
   name: Odoo modules for managing a helpdesk system
diff --git a/conf/repo/hr.yml b/conf/repo/hr.yml
index 43a2879..a4e864b 100644
--- a/conf/repo/hr.yml
+++ b/conf/repo/hr.yml
@@ -12,6 +12,7 @@ hr:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Hr
   default_branch: "17.0"
   name: Odoo human resources addons
@@ -24,6 +25,7 @@ hr-attendance:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Hr
   default_branch: "17.0"
   name: Hr attendance oca modules for odoo
@@ -36,6 +38,7 @@ hr-expense:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Hr
   default_branch: "17.0"
   name: Human resources expenses oca modules for odoo
@@ -48,6 +51,7 @@ hr-holidays:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Hr
   default_branch: "17.0"
   name: Human resources holidays oca modules for odoo
diff --git a/conf/repo/infrastructure.yml b/conf/repo/infrastructure.yml
index 9a19409..7e78e54 100644
--- a/conf/repo/infrastructure.yml
+++ b/conf/repo/infrastructure.yml
@@ -10,6 +10,7 @@ infrastructure:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Infrastructure
   default_branch: "13.0"
   name:
diff --git a/conf/repo/interface.yml b/conf/repo/interface.yml
index c868016..f009b63 100644
--- a/conf/repo/interface.yml
+++ b/conf/repo/interface.yml
@@ -9,6 +9,7 @@ interface-github:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Interface
   default_branch: "14.0"
   name: Tools to interact with github from odoo
diff --git a/conf/repo/intrastat.yml b/conf/repo/intrastat.yml
index 7468e10..95e3605 100644
--- a/conf/repo/intrastat.yml
+++ b/conf/repo/intrastat.yml
@@ -10,6 +10,7 @@ intrastat-extrastat:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Intrastat
   default_branch: "16.0"
   name: Intrastat Extrastat
diff --git a/conf/repo/iot.yml b/conf/repo/iot.yml
index e9b2eb5..c814570 100644
--- a/conf/repo/iot.yml
+++ b/conf/repo/iot.yml
@@ -7,6 +7,7 @@ iot:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Iot
   default_branch: "14.0"
   name: Internet of things (iot)
diff --git a/conf/repo/knowledge.yml b/conf/repo/knowledge.yml
index 035f2be..885a1f7 100644
--- a/conf/repo/knowledge.yml
+++ b/conf/repo/knowledge.yml
@@ -12,6 +12,7 @@ knowledge:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Knowledge
   default_branch: "16.0"
   name: Odoo document & knowledge management
diff --git a/conf/repo/l10n.yml b/conf/repo/l10n.yml
index 0e4c44c..b3e9f89 100644
--- a/conf/repo/l10n.yml
+++ b/conf/repo/l10n.yml
@@ -11,6 +11,7 @@ l10n-argentina:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "14.0"
   name: Odoo modules for argentina
@@ -26,6 +27,7 @@ l10n-austria:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "10.0"
   name: Odoo austria localization
@@ -40,6 +42,7 @@ l10n-belarus:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: L10n Belarus
@@ -58,6 +61,7 @@ l10n-belgium:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "16.0"
   name: L10n Belgium
@@ -78,6 +82,7 @@ l10n-brazil:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "14.0"
   name: "Localiza\xE7\xE3o brasileira oficial do odoo."
@@ -87,6 +92,7 @@ l10n-bulgaria:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "16.0"
   name: Odoo bulgarian localization
@@ -98,6 +104,7 @@ l10n-cambodia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "14.0"
   name: Odoo cambodian localization
@@ -117,6 +124,7 @@ l10n-canada:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Odoo modules for canada
@@ -134,6 +142,7 @@ l10n-chile:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "12.0"
   name: Odoo chilean localization
@@ -150,6 +159,7 @@ l10n-china:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "12.0"
   name: Chinese localization of odoo
@@ -166,6 +176,7 @@ l10n-colombia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Odoo modules for colombia
@@ -182,6 +193,7 @@ l10n-costa-rica:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "12.0"
   name: Odoo modules for costa Rica
@@ -198,6 +210,7 @@ l10n-croatia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "16.0"
   name: Odoo croatian localization
@@ -215,6 +228,7 @@ l10n-ecuador:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "17.0"
   name: Odoo localization for ecuador
@@ -229,6 +243,7 @@ l10n-estonia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: L10n Estonia
@@ -247,6 +262,7 @@ l10n-ethiopia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Ethiopian localization project
@@ -264,6 +280,7 @@ l10n-finland:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "16.0"
   name: L10n Finland
@@ -282,6 +299,7 @@ l10n-france:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "16.0"
   name: France localization for odoo
@@ -300,6 +318,7 @@ l10n-germany:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "14.0"
   name: L10n Germany
@@ -315,6 +334,7 @@ l10n-greece:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Odoo greek localization
@@ -332,6 +352,7 @@ l10n-india:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Odoo localization for india
@@ -346,6 +367,7 @@ l10n-indonesia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "8.0"
   name: Indonesian localization project
@@ -363,6 +385,7 @@ l10n-iran:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "17.0"
   name: Odoo localization for iran
@@ -379,6 +402,7 @@ l10n-ireland:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Odoo localization for ireland
@@ -400,6 +424,7 @@ l10n-italy:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "16.0"
   name: Odoo italian localization
@@ -414,6 +439,7 @@ l10n-japan:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "16.0"
   name: L10n Japan
@@ -434,6 +460,7 @@ l10n-luxemburg:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: L10n Luxemburg
@@ -446,6 +473,7 @@ l10n-macedonia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "12.0"
   name: Odoo macedonian localization
@@ -462,6 +490,7 @@ l10n-mexico:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "13.0"
   name: Mexican localization.
@@ -479,6 +508,7 @@ l10n-morocco:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Moroccan localization
@@ -497,6 +527,7 @@ l10n-netherlands:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "14.0"
   name: Odoo dutch localization
@@ -513,6 +544,7 @@ l10n-norway:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: The norwegian localization for odoo
@@ -531,6 +563,7 @@ l10n-peru:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Peruvian localization
@@ -545,6 +578,7 @@ l10n-poland:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Odoo polish localization
@@ -564,6 +598,7 @@ l10n-portugal:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "16.0"
   name: Odoo portuguese localization
@@ -582,6 +617,7 @@ l10n-romania:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "16.0"
   name: Romanian localization for odoo
@@ -593,6 +629,7 @@ l10n-russia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "14.0"
   name: L10n Russia
@@ -606,6 +643,7 @@ l10n-slovenia:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "10.0"
   name: Slovenian localization project
@@ -628,6 +666,7 @@ l10n-spain:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "17.0"
   name: Odoo spain localization
@@ -649,6 +688,7 @@ l10n-switzerland:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "14.0"
   name: Odoo swiss localization
@@ -665,6 +705,7 @@ l10n-taiwan:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Taiwanese localization
@@ -680,6 +721,7 @@ l10n-thailand:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "14.0"
   name: Thai localization
@@ -697,6 +739,7 @@ l10n-turkey:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Turkish localization project
@@ -710,6 +753,7 @@ l10n-ukraine:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "12.0"
   name: Ukrainian localization
@@ -727,6 +771,7 @@ l10n-united-kingdom:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Odoo localization for united kingdom
@@ -741,6 +786,7 @@ l10n-uruguay:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "12.0"
   name: Odoo localization for uruguay
@@ -759,6 +805,7 @@ l10n-usa:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "14.0"
   name: Us localization of odoo
@@ -776,6 +823,7 @@ l10n-venezuela:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: Odoo modules for venezuela
@@ -792,6 +840,7 @@ l10n-vietnam:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: L10n
   default_branch: "11.0"
   name: L10n Vietnam
diff --git a/conf/repo/logistics.yml b/conf/repo/logistics.yml
index be0350e..109217c 100644
--- a/conf/repo/logistics.yml
+++ b/conf/repo/logistics.yml
@@ -1,6 +1,7 @@
 stock-logistics-availability:
   branches:
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name:
@@ -22,6 +23,7 @@ stock-logistics-barcode:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name: Stock Logistics Barcode
@@ -30,6 +32,7 @@ stock-logistics-barcode:
 stock-logistics-interfaces:
   branches:
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name: Stock Logistics Interfaces
@@ -38,6 +41,7 @@ stock-logistics-interfaces:
 stock-logistics-orderpoint:
   branches:
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name:
@@ -58,6 +62,7 @@ stock-logistics-reporting:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name: Provides odoo logistics reporting modules
@@ -66,6 +71,7 @@ stock-logistics-reporting:
 stock-logistics-request:
   branches:
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name:
@@ -87,6 +93,7 @@ stock-logistics-tracking:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name: This repository contains modules around stock packages management
@@ -104,6 +111,7 @@ stock-logistics-transport:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name: "Transport management in odoo "
@@ -122,6 +130,7 @@ stock-logistics-warehouse:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name: Odoo warehouse management addons
@@ -140,6 +149,7 @@ stock-logistics-workflow:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Stock
   default_branch: "16.0"
   name: Odoo stock, workflow and organization
@@ -150,6 +160,7 @@ stock-weighing:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Stock
   default_branch: "15.0"
   name: Shopfloor for weighing operations
@@ -163,6 +174,7 @@ wms:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Wms
   default_branch: "16.0"
   name: Warehouse management system for advance logistic with odoo
diff --git a/conf/repo/maintenance.yml b/conf/repo/maintenance.yml
index c4448e3..fc375c2 100644
--- a/conf/repo/maintenance.yml
+++ b/conf/repo/maintenance.yml
@@ -8,6 +8,7 @@ maintenance:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Maintenance
   default_branch: "14.0"
   name: Odoo modules for businesses that implies maintenance tasks
diff --git a/conf/repo/management.yml b/conf/repo/management.yml
index c4e66bb..bc3b025 100644
--- a/conf/repo/management.yml
+++ b/conf/repo/management.yml
@@ -12,6 +12,7 @@ management-system:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Management
   default_branch: "16.0"
   name: Odoo for management systems (iso, iec, bs)
diff --git a/conf/repo/manufacture.yml b/conf/repo/manufacture.yml
index 86d1a4f..f12a1eb 100644
--- a/conf/repo/manufacture.yml
+++ b/conf/repo/manufacture.yml
@@ -12,6 +12,7 @@ manufacture:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Manufacture
   default_branch: "14.0"
   name: Odoo manufacturing addons
@@ -30,6 +31,7 @@ manufacture-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Manufacture
   default_branch: "12.0"
   name: Manufacture Reporting
diff --git a/conf/repo/margin.yml b/conf/repo/margin.yml
index 866061a..32dfd99 100644
--- a/conf/repo/margin.yml
+++ b/conf/repo/margin.yml
@@ -12,6 +12,7 @@ margin-analysis:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Margin
   default_branch: "15.0"
   name: Odoo financial controlling (margin, costs, ...)
diff --git a/conf/repo/mis.yml b/conf/repo/mis.yml
index ffba2ed..4e9134e 100644
--- a/conf/repo/mis.yml
+++ b/conf/repo/mis.yml
@@ -31,6 +31,7 @@ mis-builder-contrib:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Mis
   default_branch: "16.0"
   name:
diff --git a/conf/repo/multi.yml b/conf/repo/multi.yml
index df59e90..3df97de 100644
--- a/conf/repo/multi.yml
+++ b/conf/repo/multi.yml
@@ -12,6 +12,7 @@ multi-company:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Multi
   default_branch: "14.0"
   name: Multi Company
diff --git a/conf/repo/odoo-community.yml b/conf/repo/odoo-community.yml
index de593fb..1d662cb 100644
--- a/conf/repo/odoo-community.yml
+++ b/conf/repo/odoo-community.yml
@@ -21,6 +21,7 @@ odoo-pim:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Odoo
   default_branch: "14.0"
   name: Odoo Pim
diff --git a/conf/repo/openupgrade.yml b/conf/repo/openupgrade.yml
index 651f90d..4fef363 100644
--- a/conf/repo/openupgrade.yml
+++ b/conf/repo/openupgrade.yml
@@ -14,6 +14,7 @@ OpenUpgrade:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Openupgrade
   default_branch: "16.0"
   name: Open source upgrade path for odoo/openerp
diff --git a/conf/repo/operating.yml b/conf/repo/operating.yml
index 7cb5bee..4820bf9 100644
--- a/conf/repo/operating.yml
+++ b/conf/repo/operating.yml
@@ -11,6 +11,7 @@ operating-unit:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Operating
   default_branch: "16.0"
   name: Manage operating units in odoo
diff --git a/conf/repo/partner.yml b/conf/repo/partner.yml
index 9b6e910..135fee7 100644
--- a/conf/repo/partner.yml
+++ b/conf/repo/partner.yml
@@ -12,6 +12,7 @@ partner-contact:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Partner
   default_branch: "16.0"
   name: Odoo partner and contact related addons
diff --git a/conf/repo/payroll.yml b/conf/repo/payroll.yml
index d98b2f2..4b63d96 100644
--- a/conf/repo/payroll.yml
+++ b/conf/repo/payroll.yml
@@ -5,6 +5,7 @@ payroll:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Payroll
   default_branch: "14.0"
   name: Odoo modules for payroll management
diff --git a/conf/repo/pim.yml b/conf/repo/pim.yml
index d6785e6..017a9a1 100644
--- a/conf/repo/pim.yml
+++ b/conf/repo/pim.yml
@@ -6,6 +6,7 @@ odoo-pim:
     - "14.0"
     - "15.0"
     - "16.0"
+    - "18.0"
   category: Odoo
   default_branch: "14.0"
   name: Odoo Pim
diff --git a/conf/repo/pms.yml b/conf/repo/pms.yml
index cbba533..55bca54 100644
--- a/conf/repo/pms.yml
+++ b/conf/repo/pms.yml
@@ -4,6 +4,7 @@ pms:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Pms
   default_branch: "14.0"
   name: Property management system on odoo
diff --git a/conf/repo/pos.yml b/conf/repo/pos.yml
index 910100c..24f497a 100644
--- a/conf/repo/pos.yml
+++ b/conf/repo/pos.yml
@@ -11,6 +11,7 @@ pos:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Pos
   default_branch: "16.0"
   name: Pos
diff --git a/conf/repo/product.yml b/conf/repo/product.yml
index 3567eac..67c36ae 100644
--- a/conf/repo/product.yml
+++ b/conf/repo/product.yml
@@ -12,6 +12,7 @@ product-attribute:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
   default_branch: "16.0"
   name: Odoo product attribute
@@ -23,6 +24,7 @@ product-configurator:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
   default_branch: "14.0"
   name:
@@ -44,6 +46,7 @@ product-kitting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
   default_branch: "11.0"
   name: Odoo kitting addons
@@ -57,6 +60,7 @@ product-pack:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
   default_branch: "14.0"
   name: Odoo modules related to product packs
@@ -76,6 +80,7 @@ product-variant:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Product
   default_branch: "14.0"
   name: Product Variant
diff --git a/conf/repo/program.yml b/conf/repo/program.yml
index 5e37f49..1730124 100644
--- a/conf/repo/program.yml
+++ b/conf/repo/program.yml
@@ -5,6 +5,7 @@ program:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Program
   default_branch: "7.0"
   name: Program
diff --git a/conf/repo/project.yml b/conf/repo/project.yml
index d16af6f..6a0f4af 100644
--- a/conf/repo/project.yml
+++ b/conf/repo/project.yml
@@ -12,6 +12,7 @@ project:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Project
   default_branch: "17.0"
   name: Odoo project management and services company addons
@@ -27,6 +28,7 @@ project-agile:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Project
   default_branch: "10.0"
   name: Project Agile
@@ -46,6 +48,7 @@ project-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Project
   default_branch: "11.0"
   name: Project Reporting
diff --git a/conf/repo/purchase.yml b/conf/repo/purchase.yml
index 0450cd6..61b26a1 100644
--- a/conf/repo/purchase.yml
+++ b/conf/repo/purchase.yml
@@ -12,6 +12,7 @@ purchase-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Purchase
   default_branch: "12.0"
   name: Purchase Reporting
@@ -31,6 +32,7 @@ purchase-workflow:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Purchase
   default_branch: "16.0"
   name: Odoo purchases, workflow and organization
diff --git a/conf/repo/pwa.yml b/conf/repo/pwa.yml
index 28ebf45..5ff8b12 100644
--- a/conf/repo/pwa.yml
+++ b/conf/repo/pwa.yml
@@ -2,6 +2,7 @@ pwa-builder:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Pwa
   default_branch: "16.0"
   name: Pwa Builder
diff --git a/conf/repo/repair.yml b/conf/repo/repair.yml
index 1b987f9..73c5a70 100644
--- a/conf/repo/repair.yml
+++ b/conf/repo/repair.yml
@@ -3,6 +3,7 @@ repair:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Repair
   default_branch: "15.0"
   name: Repair
diff --git a/conf/repo/reporting.yml b/conf/repo/reporting.yml
index 36a6286..483d13b 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: "14.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: "16.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..a5e34ad 100644
--- a/conf/repo/resource.yml
+++ b/conf/repo/resource.yml
@@ -4,6 +4,7 @@ resource:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Resource
   default_branch: "16.0"
   name: Resource
diff --git a/conf/repo/rest.yml b/conf/repo/rest.yml
index f39ba5e..f3b7ead 100644
--- a/conf/repo/rest.yml
+++ b/conf/repo/rest.yml
@@ -2,6 +2,7 @@ rest-api:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Rest
   default_branch: "16.0"
   name: Rest Api
@@ -17,6 +18,7 @@ rest-framework:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Rest
   default_branch: "16.0"
   name: Rest Framework
diff --git a/conf/repo/rma.yml b/conf/repo/rma.yml
index a3f69e1..e40cdf4 100644
--- a/conf/repo/rma.yml
+++ b/conf/repo/rma.yml
@@ -13,6 +13,7 @@ rma:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Rma
   default_branch: "16.0"
   name: Odoo for return merchandise authorization (rma)
diff --git a/conf/repo/role.yml b/conf/repo/role.yml
index 47c93d0..b888bca 100644
--- a/conf/repo/role.yml
+++ b/conf/repo/role.yml
@@ -4,6 +4,7 @@ role-policy:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Role
   default_branch: "13.0"
   name: Role Policy
diff --git a/conf/repo/runbot.yml b/conf/repo/runbot.yml
index fc697cd..1d0bc1f 100644
--- a/conf/repo/runbot.yml
+++ b/conf/repo/runbot.yml
@@ -10,6 +10,7 @@ runbot-addons:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Runbot
   default_branch: "11.0"
   name: Odoo runbot custom features to be used by community.
diff --git a/conf/repo/sale.yml b/conf/repo/sale.yml
index 41bd537..a4e45df 100644
--- a/conf/repo/sale.yml
+++ b/conf/repo/sale.yml
@@ -2,6 +2,7 @@ sale-channel:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
   default_branch: "16.0"
   name: Sale Channel
@@ -21,6 +22,7 @@ sale-financial:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
   default_branch: "11.0"
   name: Odoo sale and financial related addons
@@ -33,6 +35,7 @@ sale-promotion:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
   default_branch: "16.0"
   name: Sale Promotion
@@ -52,6 +55,7 @@ sale-reporting:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
   default_branch: "14.0"
   name: Sale Reporting
@@ -71,6 +75,7 @@ sale-workflow:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sale
   default_branch: "16.0"
   name: Odoo sales, workflow and organization
diff --git a/conf/repo/search.yml b/conf/repo/search.yml
index c980db0..1b330e7 100644
--- a/conf/repo/search.yml
+++ b/conf/repo/search.yml
@@ -7,6 +7,7 @@ search-engine:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Search
   default_branch: "16.0"
   name: Search Engine
diff --git a/conf/repo/server.yml b/conf/repo/server.yml
index 450c294..3b1a064 100644
--- a/conf/repo/server.yml
+++ b/conf/repo/server.yml
@@ -10,6 +10,7 @@ server-auth:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Server
   default_branch: "16.0"
   name: Server Auth
@@ -24,6 +25,7 @@ server-backend:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Server
   default_branch: "14.0"
   name: Server Backend
@@ -38,6 +40,7 @@ server-brand:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Server
   default_branch: "17.0"
   name: Server Brand
@@ -88,6 +91,7 @@ server-ux:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Server
   default_branch: "16.0"
   name: Server Ux
diff --git a/conf/repo/shift.yml b/conf/repo/shift.yml
index 70dca3c..b4f8490 100644
--- a/conf/repo/shift.yml
+++ b/conf/repo/shift.yml
@@ -4,6 +4,7 @@ shift-planning:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Shift
   default_branch: "12.0"
   name: Shift Planning
diff --git a/conf/repo/sign.yml b/conf/repo/sign.yml
index e88936a..398949a 100644
--- a/conf/repo/sign.yml
+++ b/conf/repo/sign.yml
@@ -4,6 +4,7 @@ sign:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Sign
   default_branch: "13.0"
   name: Sign
diff --git a/conf/repo/social.yml b/conf/repo/social.yml
index 6294df8..3530a41 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: "16.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
+  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..880f989 100644
--- a/conf/repo/spreadsheet.yml
+++ b/conf/repo/spreadsheet.yml
@@ -2,6 +2,7 @@ spreadsheet:
   branches:
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Spreadsheet
   default_branch: "16.0"
   name: Spreadsheet
diff --git a/conf/repo/survey.yml b/conf/repo/survey.yml
index 40a573f..f1d05df 100644
--- a/conf/repo/survey.yml
+++ b/conf/repo/survey.yml
@@ -10,6 +10,7 @@ survey:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Survey
   default_branch: "14.0"
   name: Survey addons
diff --git a/conf/repo/timesheet.yml b/conf/repo/timesheet.yml
index 27d120e..b870124 100644
--- a/conf/repo/timesheet.yml
+++ b/conf/repo/timesheet.yml
@@ -12,6 +12,7 @@ timesheet:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Timesheet
   default_branch: "14.0"
   name: Odoo timesheet management addons
diff --git a/conf/repo/vertical.yml b/conf/repo/vertical.yml
index 0bb9efe..a45e721 100644
--- a/conf/repo/vertical.yml
+++ b/conf/repo/vertical.yml
@@ -10,6 +10,7 @@ vertical-abbey:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "14.0"
   name: Vertical Abbey
@@ -27,6 +28,7 @@ vertical-agriculture:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "14.0"
   name: Verticalization of odoo for farms and agroindustries
@@ -44,6 +46,7 @@ vertical-association:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "14.0"
   name: Odoo addons for membership related tasks
@@ -61,6 +64,7 @@ vertical-community:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "11.0"
   name: Odoo for communities verticalization
@@ -80,6 +84,7 @@ vertical-construction:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "11.0"
   name: Odoo for construction company
@@ -91,6 +96,7 @@ vertical-cooperative-supermarket:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "12.0"
   name: Vertical Cooperative Supermarket
@@ -108,6 +114,7 @@ vertical-edition:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "11.0"
   name: Vertical Edition
@@ -126,6 +133,7 @@ vertical-education:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "11.0"
   name: Odoo modules for schools, universities and other education organizations
@@ -145,6 +153,7 @@ vertical-hotel:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "15.0"
   name: Odoo for hotel management
@@ -163,6 +172,7 @@ vertical-isp:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "12.0"
   name: Odoo modules for internet service providers
@@ -175,6 +185,7 @@ vertical-medical:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "14.0"
   name: Open source healthcare system for odoo
@@ -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
+  name: Odoo for ngo"s and humanitarian organization
   psc: vertical-ngo-maintainers
   psc_rep: vertical-ngo-maintainers-psc-representative
 vertical-realestate:
@@ -206,6 +218,7 @@ vertical-realestate:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "13.0"
   name: Odoo modules for real estate business
@@ -218,6 +231,7 @@ vertical-rental:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "12.0"
   name: Vertical Rental
@@ -236,6 +250,7 @@ vertical-travel:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Vertical
   default_branch: "11.0"
   name: Vertical Travel
diff --git a/conf/repo/wallet.yml b/conf/repo/wallet.yml
index 889dc0c..f39024c 100644
--- a/conf/repo/wallet.yml
+++ b/conf/repo/wallet.yml
@@ -4,6 +4,7 @@ wallet:
     - "14.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Wallet
   default_branch: "14.0"
   name: Wallet
diff --git a/conf/repo/web.yml b/conf/repo/web.yml
index bcc1a4f..b0d2235 100644
--- a/conf/repo/web.yml
+++ b/conf/repo/web.yml
@@ -12,6 +12,7 @@ web:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Web
   default_branch: "16.0"
   name: Odoo web client ui related addons
@@ -23,6 +24,7 @@ web-api:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Web
   default_branch: "14.0"
   name: Web Api
@@ -34,6 +36,7 @@ web-api-contrib:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Web
   default_branch: "14.0"
   name: Web API contrib
diff --git a/conf/repo/webhook.yml b/conf/repo/webhook.yml
index 1dd4573..47080fb 100644
--- a/conf/repo/webhook.yml
+++ b/conf/repo/webhook.yml
@@ -9,6 +9,7 @@ webhook:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Webhook
   default_branch: "11.0"
   name:
diff --git a/conf/repo/webkit.yml b/conf/repo/webkit.yml
index 810cff4..2c4426b 100644
--- a/conf/repo/webkit.yml
+++ b/conf/repo/webkit.yml
@@ -12,6 +12,7 @@ webkit-tools:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Webkit
   default_branch: "12.0"
   name: Webkit Tools
diff --git a/conf/repo/website.yml b/conf/repo/website.yml
index 97c8139..098a9d0 100644
--- a/conf/repo/website.yml
+++ b/conf/repo/website.yml
@@ -10,6 +10,7 @@ website:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Website
   default_branch: "14.0"
   name: Odoo website builder addons
@@ -27,6 +28,7 @@ website-cms:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Website
   default_branch: "13.0"
   name: Cms features for odoo website
@@ -41,6 +43,7 @@ website-themes:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Website
   default_branch: "11.0"
   name: Website themes for odoo