diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 7bea2d4fae7d1a3e49cf847f0ed1bcdc2d94a124..3d975480ccf79d6d0cf57dd4cd4d81b993556b09 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -1,20 +1,20 @@
 # ARON
 
-/source/RobotAPI/libraries/aron/ @peller @dreher
+/source/RobotAPI/libraries/aron/ @plewnia @hyseni
 
-/source/RobotAPI/interface/aron/ @peller @dreher
-/source/RobotAPI/interface/aron.ice @peller @dreher
+/source/RobotAPI/interface/aron/ @plewnia @hyseni
+/source/RobotAPI/interface/aron.ice @plewnia @hyseni @dreher
 
 
 # ArMem
-/source/RobotAPI/components/armem/ @peller @kartmann @dreher
+/source/RobotAPI/components/armem/ @plenwia
 
-/source/RobotAPI/libraries/armem/ @peller @kartmann @dreher
+/source/RobotAPI/libraries/armem/ @plewnia
 /source/RobotAPI/libraries/armem_robot_localization/ @reister
 /source/RobotAPI/libraries/armem_robot_mapping/ @reister
 
-/source/RobotAPI/interface/armem/ @fratty @RainerKartmann @dreher
-/source/RobotAPI/interface/armem.ice @fratty @RainerKartmann @dreher
+/source/RobotAPI/interface/armem/ @plewnia
+/source/RobotAPI/interface/armem.ice @plewnia @dreher
 
 # Skill framework
 /source/RobotAPI/interface/skills @meixner @rietsch