diff --git a/CODEOWNERS b/CODEOWNERS
index 5e8dfec7ee86d0aaff04bab2fb2518179fd654e1..671df3684c7bfa1e8c84aa80537fd4537311f3da 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,34 +1,51 @@
 # Ending a path in a `/` will specify the code owners for every file
 # nested in that directory, on any level
-/ @f.uhlig @p.-a.loizeau @d.emschermann
+/ @f.uhlig @p.-a.loizeau @e.clerkin
+
+# Repository technical side
+/ci_scripts/ @f.uhlig @p.-a.loizeau @e.clerkin
 
 ## Detectors
 
 # TRD
 /trd/ @a.bercuci @p.kaehler
+/macro/trd/ @a.bercuci @p.kaehler
 
-# PSD
-/psd/ @karpushkin_AT_inr.ru
+# PSD/FSD
+/psd/ @dvorar10_AT_fjfi.cvut.cz @e.clerkin @i.selyuzhenkov
+/macro/psd/ @dvorar10_AT_fjfi.cvut.cz @e.clerkin @i.selyuzhenkov
+/fsd/ @dvorar10_AT_fjfi.cvut.cz
+/macro/fsd/ @dvorar10_AT_fjfi.cvut.cz
 
 # MUCH
 /much/ @v.singhal
+/macro/much/ @v.singhal
 
 # TOF
 /tof/ @n.herrmann @i.deppner
+/macro/tof/ @n.herrmann @i.deppner
 
 # RICH
-/rich/ @s.lebedev
+/rich/ @s.lebedev @ma.beyer @s.neuhaus
+/macro/rich/ @s.lebedev @ma.beyer @s.neuhaus
 
 # STS
-/sts/ @v.friese @a.toia
+/sts/ @v.friese @a.toia @m.shiroya
+/macro/sts/ @v.friese @a.toia @m.shiroya
 
 # MVD
 /mvd/ @c.muentz @m.deveaux
+/macro/mvd/ @c.muentz @m.deveaux
 
 # passive geometries
 /magnet/ @e.clerkin
 /passive/ @e.clerkin
+/macro/passive/ @e.clerkin
 /pipe/ @e.clerkin
+/macro/pipe/ @e.clerkin
 
-#setups
+# setups
 /setup/ @e.clerkin
+
+# mCBM
+/mcbm/ @c.sturm