diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 99d598ba67..a2896712cb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,24 +1,67 @@
 # Default code owner
-*                        @igorpecovnik
+*                                                           @igorpecovnik
 
 # the last matching pattern takes the most
 
-*.md                     @EvilOlaf @littlecxm @TheLinuxBug @TRSx80
-*.patch                  @armbian/board-maintainers
+*.md                                                        @EvilOlaf @littlecxm @TheLinuxBug @TRSx80
+*.patch                                                     @armbian/board-maintainers
   
-.github/                 @littlecxm
-.vscode                  @littlecxm
+.github/                                                    @littlecxm
+.vscode                                                     @littlecxm
 
-config/                  @armbian/board-maintainers
-config/cli               @amazingfate @paolosabatino
-config/desktop           @amazingfate @monkaBlyat @paolosabatino
-config/distributions     @rpardini @neheb
-config/its               @ManoftheSea
-config/kernel            @marcone @150balbes @Manouchehri @brentr @amazingfate @hzyitc @juanesf @catalinii 
-config/optional          @iav @hzyitc @mhoffrog
-config/sources           @armbian/board-maintainers
-config/templates         @The-going @iav @neheb
+config/                                                     @armbian/board-maintainers
+config/cli                                                  @amazingfate @paolosabatino
+config/desktop                                              @amazingfate @monkaBlyat @paolosabatino
+config/distributions                                        @rpardini @neheb
+config/its                                                  @ManoftheSea
+config/optional                                             @iav @hzyitc @mhoffrog
+config/sources                                              @armbian/board-maintainers
+config/templates                                            @The-going @iav @neheb
 
-lib/                     @rpardini @150balbes @The-going @iav @hzyitc @mhoffrog @armbian/build-scripts
-packages/                @matthijskooijman @SteeManMI @The-going @marcone @mklein-de @schwar3kat @joekhoobyar @armbian/board-maintainers
-tools/                   @The-going @iav @neheb @hzyitc @mhoffrog
+lib/                                                        @rpardini @150balbes @The-going @iav @hzyitc @mhoffrog @armbian/build-scripts
+packages/                                                   @matthijskooijman @SteeManMI @The-going @marcone @mklein-de @schwar3kat @joekhoobyar @armbian/board-maintainers
+tools/                                                      @The-going @iav @neheb @hzyitc @mhoffrog
+
+config/kernel/linux-bcm2711-current.config                  @igorpecovnik
+config/kernel/linux-bcm2711-edge.config                     @igorpecovnik
+config/kernel/linux-jetson-nano-legacy.config               @150balbes
+config/kernel/linux-media-current.config                    @150balbes
+config/kernel/linux-media-edge.config                       @150balbes
+config/kernel/linux-meson64-current.config                  @rpardini
+config/kernel/linux-meson64-edge.config                     @rpardini
+config/kernel/linux-meson-current.config                    @hzyitc
+config/kernel/linux-meson-edge.config                       @hzyitc
+config/kernel/linux-meson-legacy.config                     @hzyitc
+config/kernel/linux-mvebu64-current.config                  @ManoftheSea
+config/kernel/linux-mvebu64-edge.config                     @ManoftheSea
+config/kernel/linux-mvebu-current.config                    @Heisath
+config/kernel/linux-mvebu-edge.config                       @Heisath
+config/kernel/linux-odroidxu4-current.config                @belegdol
+config/kernel/linux-odroidxu4-edge.config                   @belegdol
+config/kernel/linux-rk322x-current.config                   @paolosabatino
+config/kernel/linux-rk322x-edge.config                      @paolosabatino
+config/kernel/linux-rk322x-legacy.config                    @paolosabatino
+config/kernel/linux-rk3568-odroid-edge.config               @rpardini
+config/kernel/linux-rk35xx-legacy.config                    @catalinii
+config/kernel/linux-rockchip64-current.config               @brentr @Tonymac32 @paolosabatino @Manouchehri @piter75
+config/kernel/linux-rockchip64-edge.config                  @brentr @Tonymac32 @paolosabatino @Manouchehri @piter75
+config/kernel/linux-rockchip64-legacy.config                @brentr @Tonymac32 @paolosabatino @Manouchehri @piter75
+config/kernel/linux-rockchip-current.config                 @jpegxguy @iav @paolosabatino
+config/kernel/linux-rockchip-edge.config                    @jpegxguy @iav @paolosabatino
+config/kernel/linux-rockchip-rk3588-legacy.config           @amazingfate @nyanmisaka @ginkage
+config/kernel/linux-rockpis-legacy.config                   @brentr
+config/kernel/linux-station-m3-legacy.config                @150balbes
+config/kernel/linux-station-p2-legacy.config                @150balbes
+config/kernel/linux-sun50iw9-legacy.config                  @The-going
+config/kernel/linux-sunxi64-current.config                  @The-going
+config/kernel/linux-sunxi64-edge.config                     @The-going
+config/kernel/linux-sunxi64-legacy.config                   @The-going
+config/kernel/linux-sunxi-current.config                    @The-going
+config/kernel/linux-sunxi-edge.config                       @The-going
+config/kernel/linux-sunxi-legacy.config                     @The-going
+config/kernel/linux-uefi-arm64-current.config               @igorpecovnik
+config/kernel/linux-uefi-arm64-edge.config                  @igorpecovnik
+config/kernel/linux-uefi-riscv64-current.config             @igorpecovnik
+config/kernel/linux-uefi-riscv64-edge.config                @igorpecovnik
+config/kernel/linux-uefi-x86-current.config                 @igorpecovnik
+config/kernel/linux-uefi-x86-edge.config                    @igorpecovnik