diff --git a/CODEOWNERS b/CODEOWNERS
index bf012cc60e15ea6b29d1fc6520e8f77b3e53ac48..9ee1be8227a44323dc76dfcfd33da04e7895cb4c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -16,23 +16,26 @@
 
 # Core
 /core/             @f.uhlig @v.friese @p.-a.loizeau
-/core/qa/          @se.gorbunov
+/core/qa/          @se.gorbunov @s.zharko
 /core/data/test/   @f.uhlig
 /core/data/raw/    @p.-a.loizeau
 /core/base/utils/  @f.uhlig @s.lebedev
 /core/base/report/ @s.lebedev
 /core/base/draw/   @s.lebedev
 
+# Algo
+/algo/ @d.smith @fweig
+
 # Simulation
 /sim/                    @f.uhlig @v.friese @p.-a.loizeau
-/sim/transport/geosetup/ @e.lavrik
+#/sim/transport/geosetup/ @e.lavrik
 
 # Reco
 /reco/              @f.uhlig @v.friese @p.-a.loizeau
 /reco/littrack/     @s.lebedev @andrey.lebedev
-/reco/L1/           @se.gorbunov @v.akishina
+/reco/L1/           @se.gorbunov @s.zharko
 /reco/eventbuilder/ @d.smith
-/reco/KF/           @se.gorbunov @v.akishina
+/reco/KF/           @se.gorbunov @s.zharko
 
 # Analysis
 /analysis/                                 @i.selyuzhenkov
@@ -56,6 +59,7 @@
 /macro/trd/           @a.bercuci @p.kaehler
 /sim/detectors/trd/   @a.bercuci @p.kaehler
 /reco/detectors/trd/  @a.bercuci @p.kaehler
+/algo/detectors/trd/  @a.bercuci @p.kaehler
 
 # PSD
 /analysis/detectors/psd/ @karpushkin_AT_inr.ru
@@ -80,6 +84,8 @@
 /macro/much/             @v.singhal
 /sim/detectors/much/     @v.singhal
 /reco/detectors/much/    @v.singhal
+/algo/detectors/much/    @v.singhal
+/macro/analysis/much/    @v.singhal
 
 # TOF
 /analysis/detectors/tof/ @n.herrmann @i.deppner
@@ -92,14 +98,16 @@
 /reco/detectors/tof/     @n.herrmann @i.deppner
 /MQ/eTOF/                @n.herrmann @i.deppner
 /MQ/hitbuilder/          @n.herrmann @i.deppner
+/algo/detectors/tof/     @n.herrmann @i.deppner
 
 # RICH
-/core/data/rich/      @s.lebedev
-/core/data/test/rich/ @s.lebedev
-/core/detectors/rich/ @s.lebedev
-/macro/rich/          @s.lebedev
-/sim/detectors/rich/  @s.lebedev
-/reco/detectors/rich/ @s.lebedev
+/core/data/rich/      @martin.beyer@physik.uni-giessen.de
+/core/data/test/rich/ @martin.beyer@physik.uni-giessen.de
+/core/detectors/rich/ @martin.beyer@physik.uni-giessen.de
+/macro/rich/          @martin.beyer@physik.uni-giessen.de
+/sim/detectors/rich/  @martin.beyer@physik.uni-giessen.de
+/reco/detectors/rich/ @martin.beyer@physik.uni-giessen.de
+/algo/detectors/rich/ @martin.beyer@physik.uni-giessen.de
 
 # STS
 /analysis/detectors/sts/ @v.friese
@@ -110,8 +118,13 @@
 /sim/detectors/sts/      @v.friese
 /reco/detectors/sts/     @v.friese
 /MQ/sts/                 @v.friese
+/algo/detectors/sts/     @v.friese
+/algo/data/sts/          @v.friese
 
 # MVD
-/core/data/mvd/ @c.muentz @m.deveaux
-/macro/mvd/     @c.muentz @m.deveaux
-/mvd/           @c.muentz @m.deveaux
+/reco/detectors/mvd/     @c.muentz @m.deveaux
+/core/detectors/mvd/     @c.muentz @m.deveaux
+/core/data/mvd/          @c.muentz @m.deveaux
+/analysis/detectors/mvd/ @c.muentz @m.deveaux
+/macro/mvd/              @c.muentz @m.deveaux
+/sim/detectors/mvd/      @c.muentz @m.deveaux