diff --git a/conf/repo/connector.yml b/conf/repo/connector.yml
index 4d440cc..2a601e8 100644
--- a/conf/repo/connector.yml
+++ b/conf/repo/connector.yml
@@ -11,6 +11,7 @@ connector:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "16.0"
   name: Odoo generic connector framework (jobs queue, asynchronous tasks, channels)
@@ -97,6 +98,7 @@ connector-interfaces:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Connector
   default_branch: "16.0"
   name: Odoo generic connector for odbc, .csv,...
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/queue.yml b/conf/repo/queue.yml
index ca6a8e1..ac099ba 100644
--- a/conf/repo/queue.yml
+++ b/conf/repo/queue.yml
@@ -8,6 +8,7 @@ queue:
     - "15.0"
     - "16.0"
     - "17.0"
+    - "18.0"
   category: Queue
   default_branch: "16.0"
   name: Asynchronous job queue