diff --git a/conf/psc/mail.yml b/conf/psc/mail.yml
new file mode 100644
index 0000000..fbd4eee
--- /dev/null
+++ b/conf/psc/mail.yml
@@ -0,0 +1,16 @@
+mail-maintainers:
+  members:
+    - yajo
+    - antespi
+    - hbrunn
+    - pedrobaeza
+    - rafaelbn
+    - etobella
+  name: Mail maintainers
+  representatives:
+    - simahawk
+mail-maintainers-psc-representative:
+  members:
+    - hbrunn
+  name: Mail maintainers psc representative
+  representatives: []
diff --git a/conf/repo/mail.yml b/conf/repo/mail.yml
new file mode 100644
index 0000000..51b18fa
--- /dev/null
+++ b/conf/repo/mail.yml
@@ -0,0 +1,8 @@
+mail:
+  branches:
+    - "18.0"
+  category: Mail
+  default_branch: "18.0"
+  name: Addons related to odoo's messaging features
+  psc: mail-maintainers
+  psc_rep: mail-maintainers-psc-representative