diff --git a/CODEOWNERS b/CODEOWNERS
index ab32236037ca277f35cf94183fd2abcced78a952..dced90d737727371f396288440031d3f6461b047 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,28 @@
-[moduleBasics]
-moduleBasics/ @moduleBasics-team @kristina.mazur
\ No newline at end of file
+# Folder-specific code ownership
+aerodynamics/                @lukas.neuerburg   @ellen.seabrooke   @gPauls-TUHH
+aircraftGeometry2/           @meric.taneri      @AndiGob           @ChrisRuw
+airfoils/                    @ChrisRuw          @gPauls-TUHH
+aixml/                       @ChrisRuw          @gPauls-TUHH       @kristina.mazur
+atmosphere/                  @lukas.neuerburg   @gPauls-TUHH       @ellen.seabrooke
+blackboxTest/                @maurice.zimmnau   @kristina.mazur
+coordinalteSystemConversion/ @meric.taneri      @AndiGob
+engine/                      @tobi747           @ellen.seabrooke   @lukas.neuerburg
+extern/                      @kristina.mazur    @ChrisRuw
+liftingLineInterface2/       @lukas.neuerburg   @ellen.seabrooke   @gPauls-TUHH
+moduleBasics/                @ChrisRuw          @gPauls-TUHH       @kristina.mazur
+pymodulepackage/             @ChrisRuw          @AndiGob           @gPauls-TUHH
+runtimeInfo/                 @ellen.seabrooke   @ChrisRuw          @kristina.mazur
+standardFiles/               @ellen.seabrooke   @lukas.neuerburg   @kristina.mazur
+svl/                         @ChrisRuw          @gPauls-TUHH       @kristina.mazur
+unitConversion/              @gPauls-TUHH       @lukas.neuerburg   @ChrisRuw
+
+# File-specific code ownership
+.gitattributes               @Florian.Schueltke
+.gitignore                   @Florian.Schueltke
+.gitlab-ci.yml               @maurice.zimmnau   @kristina.mazur
+CMakeLists.txt               @Florian.Schueltke
+CMakePresets.json            @Florian.Schueltke
+CODEOWNERS                   @Florian.Schueltke
+LICENSE                      @Florian.Schueltke
+UnicadoLibsConfig.cmake.in   @Florian.Schueltke
+UnicadoPythonPackages.cmake.in @Florian.Schueltke