diff --git a/CODEOWNERS b/CODEOWNERS
index f4d9d74d36889da048efb5cafcc4b9a3119d49dc..a7e242a5f5d893ed29605b6ca1cc664140be2d11 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -8,27 +8,27 @@
 
 ## Detectors
 
-# TRD
-/trd/ @a.bercuci @p.kaehler
+# MVD
+/mvd/ @c.muentz @m.deveaux
 
-# PSD/FSD
-/psd/ @e.clerkin @i.selyuzhenkov
-/fsd/ @dvorar10_AT_fjfi.cvut.cz
+# STS
+/sts/ @v.friese @a.toia @m.shiroya
+
+# RICH
+/rich/ @ma.beyer @s.neuhaus
 
 # MUCH
 /much/ @v.singhal
 
+# TRD
+/trd/ @a.bercuci @p.kaehler @a.puntke
+
 # TOF
 /tof/ @n.herrmann @i.deppner
 
-# RICH
-/rich/ @s.lebedev @ma.beyer @s.neuhaus
-
-# STS
-/sts/ @v.friese @a.toia @m.shiroya
-
-# MVD
-/mvd/ @c.muentz @m.deveaux
+# FSD/PSD
+/fsd/ @dvorar10_AT_fjfi.cvut.cz
+/psd/ @e.clerkin @i.selyuzhenkov
 
 # ONLINE
-/online/ @v.friese @d.smith @fweig @s.zharko
+/online/ @v.friese @s.zharko