diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 60e9b57ea..66d771fa5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -51,7 +51,7 @@ config/boards/firefly-itx-3588j.csc		@SeeleVolleri
 config/boards/fxblox-rk1.csc		@mahdichi
 config/boards/gateway-gz80x.conf		@pyavitz
 config/boards/h96-tvbox-3566.tvb		@hqnicolas
-config/boards/helios4.conf		@Heisath
+config/boards/helios4.conf		@leggewie
 config/boards/helios64.conf		@prahal
 config/boards/hinlink-h28k.csc		@sputnik2019
 config/boards/hinlink-ht2.csc		@hoochiwetech
@@ -184,7 +184,7 @@ config/kernel/linux-k3-beagle-*.config		@Grippy98
 config/kernel/linux-meson-*.config		@hzyitc @juanlufont
 config/kernel/linux-meson-s4t7-*.config		@adeepn @leggewie @rpardini @viraniac
 config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @pyavitz @rpardini @teknoid
-config/kernel/linux-mvebu-*.config		@Heisath
+config/kernel/linux-mvebu-*.config		@Heisath @leggewie
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
 config/kernel/linux-rk35xx-*.config		@CodeChenL @ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @andyshrk @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
@@ -224,7 +224,7 @@ patch/kernel/archive/k3-beagle-*/		@Grippy98
 patch/kernel/archive/meson-*/		@hzyitc @juanlufont
 patch/kernel/archive/meson-s4t7-*/		@adeepn @leggewie @rpardini @viraniac
 patch/kernel/archive/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @pyavitz @rpardini @teknoid
-patch/kernel/archive/mvebu-*/		@Heisath
+patch/kernel/archive/mvebu-*/		@Heisath @leggewie
 patch/kernel/archive/odroidxu4-*/		@joekhoobyar
 patch/kernel/archive/rockchip-*/		@paolosabatino
 patch/kernel/archive/rockchip64-*/		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @chainsx @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @pyavitz @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
@@ -245,7 +245,7 @@ patch/kernel/thead-*/		@chainsx
 patch/kernel/wsl2-arm64-*/		@rpardini
 patch/u-boot/legacy/		@chainsx @joekhoobyar @juanlufont @lanefu
 patch/u-boot/legacy/u-boot-clearfog/		@Heisath
-patch/u-boot/legacy/u-boot-helios4/		@Heisath
+patch/u-boot/legacy/u-boot-helios4/		@leggewie
 patch/u-boot/legacy/u-boot-khadas-edge2-rk3588/		@efectn
 patch/u-boot/legacy/u-boot-radxa-rk35xx/		@CodeChenL @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @linhz0hz @mahdichi @mattx433 @prahal @rpardini @schwar3kat @sputnik2019 @tdleiyao @vamzii
 patch/u-boot/legacy/u-boot-spacemit-k1/		@pyavitz
@@ -294,7 +294,7 @@ sources/families/meson-gxl.conf		@SteeManMI @Tonymac32 @igorpecovnik @jomadeto
 sources/families/meson-s4t7.conf		@adeepn @leggewie @rpardini @viraniac
 sources/families/meson-sm1.conf		@Tonymac32 @igorpecovnik @rpardini
 sources/families/meson8b.conf		@hzyitc @juanlufont
-sources/families/mvebu.conf		@Heisath
+sources/families/mvebu.conf		@Heisath @leggewie
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
 sources/families/rk35xx.conf		@CodeChenL @ZazaBR @amazingfate @andyshrk @catalinii @hoochiwetech @hqnicolas @krachlatte @mattx433 @pyavitz @sputnik2019 @tdleiyao @vamzii
diff --git a/config/boards/helios4.conf b/config/boards/helios4.conf
index f3b4e241f..f56eebdcf 100644
--- a/config/boards/helios4.conf
+++ b/config/boards/helios4.conf
@@ -1,7 +1,7 @@
 # Marvell Armada 388 2GB ECC RAM SoC 4xSATA 2xUSB3.0 GBE SPI
 BOARD_NAME="Helios4"
 BOARDFAMILY="mvebu"
-BOARD_MAINTAINER="Heisath"
+BOARD_MAINTAINER="leggewie"
 BOOTCONFIG="helios4_defconfig"
 BOOTCONFIG_NEXT="helios4_defconfig"
 MODULES_LEGACY="marvell_cesa lm75"
diff --git a/config/boards/radxa-rock-4d.conf b/config/boards/radxa-rock-4d.csc
similarity index 97%
rename from config/boards/radxa-rock-4d.conf
rename to config/boards/radxa-rock-4d.csc
index d14405509..8c21ac1d1 100644
--- a/config/boards/radxa-rock-4d.conf
+++ b/config/boards/radxa-rock-4d.csc
@@ -1,7 +1,7 @@
 # Rockchip RK3576 SoC octa core 4-16GB SoC GBe eMMC UFS USB3 WIFI
 BOARD_NAME="Radxa Rock 4D"
 BOARDFAMILY="rk35xx"
-BOARD_MAINTAINER="HeyMeco"
+BOARD_MAINTAINER=""
 BOOTCONFIG="rock-4d-spi-rk3576_defconfig"
 KERNEL_TARGET="vendor"
 KERNEL_TEST_TARGET="vendor"