diff --git a/CODEOWNERS b/CODEOWNERS
index cab9ebd413869547ee940882f331fe16aed2434c..1b5458d2eb6f345206e28315039c39bb025e421f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,14 +2,14 @@
 
 # Design tools
 create_mission_xml/           @gPauls-TUHH
-empennage_design/             @ChrisRuw         @AndiGob
+empennage_design/             @JensViloehr         @AndiGob
 fuselage_design/              @AndiGob
 initial_sizing/               @ellen.seabrooke  @johannes.schneider
 landing_gear_design/          @AndiGob
 propulsion_design/            @tobi747          @meric.taneri
 systems_design/               @ellen.seabrooke
 tank_design/                  @s-roscher
-wing_design/                  @ChrisRuw
+wing_design/                  @JensViloehr
 
 # Analysis tools
 aerodynamic_analysis/         @lukas.neuerburg  @Florian.Schueltke