diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 30d01e52722c..309ab7a7239d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -20,6 +20,7 @@ config/boards/aml-a311d-cc.conf		@Tonymac32
 config/boards/aml-s905d3-cc.wip		@Tonymac32
 config/boards/aml-s9xx-box.tvb		@SteeManMI
 config/boards/armsom-sige1.csc		@amazingfate
+config/boards/armsom-sige3.csc		@amazingfate
 config/boards/avaota-a1.conf		@chainsx
 config/boards/ayn-odin2.eos		@FantasyGmm
 config/boards/bananapi.conf		@DylanHP @janprunk
@@ -72,7 +73,7 @@ config/boards/nanopct6.conf		@SuperKali @Tonymac32
 config/boards/nanopi-r4s.conf		@Manouchehri
 config/boards/nanopi-r5s.csc		@utlark
 config/boards/nanopi-r6c.csc		@ColorfulRhino
-config/boards/nanopi-r6s.csc		@efectn
+config/boards/nanopi-r6s.conf		@efectn
 config/boards/nanopiair.csc		@1ubuntuuser
 config/boards/nanopiduo.csc		@sgjava
 config/boards/nanopim4v2.conf		@igorpecovnik
@@ -122,7 +123,7 @@ config/boards/rock-5c.conf		@amazingfate
 config/boards/rock-s0.conf		@brentr
 config/boards/rock64.csc		@clee
 config/boards/rockpi-4a.csc		@clee
-config/boards/rockpi-e.conf		@krachlatte
+config/boards/rockpi-e.conf		@paolosabatino
 config/boards/rockpi-s.conf		@brentr
 config/boards/rockpro64.csc		@joekhoobyar
 config/boards/rpi4b.conf		@PanderMusubi @teknoid
diff --git a/config/boards/cherryba-m1.csc b/config/boards/cherryba-m1.csc
index c38cc11dd768..ea4dafb9e551 100644
--- a/config/boards/cherryba-m1.csc
+++ b/config/boards/cherryba-m1.csc
@@ -8,4 +8,4 @@ KERNEL_TEST_TARGET="current,edge" # in case different then kernel target
 FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOTBRANCH_BOARD="tag:v2024.01"
 BOOTPATCHDIR="v2024.01"
-BOARD_MAINTAINER="IsMrX"
+BOARD_MAINTAINER=""
diff --git a/config/boards/radxa-e20c.csc b/config/boards/radxa-e20c.csc
index fd9a7c650631..d0265658cb5e 100644
--- a/config/boards/radxa-e20c.csc
+++ b/config/boards/radxa-e20c.csc
@@ -2,7 +2,7 @@
 BOARD_NAME="Radxa E20C"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="radxa_e20c_rk3528_defconfig"
-BOARD_MAINTAINER="mattx433"
+BOARD_MAINTAINER=""
 KERNEL_TARGET="vendor"
 FULL_DESKTOP="no"
 BOOT_LOGO="desktop"
diff --git a/config/boards/rockpi-e.conf b/config/boards/rockpi-e.conf
index 4d396b963e07..57b97c8a1c72 100644
--- a/config/boards/rockpi-e.conf
+++ b/config/boards/rockpi-e.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3328 quad core 256MB-2GB 1xGBE 1xETH USB3 [WiFi]
 BOARD_NAME="Rockpi E"
 BOARDFAMILY="rockchip64"
-BOARD_MAINTAINER="krachlatte"
+BOARD_MAINTAINER="paolosabatino"
 BOOTCONFIG="rock-pi-e-rk3328_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"