diff --git a/config/boards/armsom-sige7.csc b/config/boards/armsom-sige7.csc
index 0668591520e7..079641b4f1b3 100644
--- a/config/boards/armsom-sige7.csc
+++ b/config/boards/armsom-sige7.csc
@@ -3,7 +3,7 @@ BOARD_NAME="ArmSoM Sige7"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="Z-Keven"
 BOOTCONFIG="armsom-sige7-rk3588_defconfig"
-KERNEL_TARGET="vendor,edge,collabora"
+KERNEL_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb"
diff --git a/config/boards/bananapi.csc b/config/boards/bananapi.conf
similarity index 94%
rename from config/boards/bananapi.csc
rename to config/boards/bananapi.conf
index a6dc606d25cd..337fd409aa50 100644
--- a/config/boards/bananapi.csc
+++ b/config/boards/bananapi.conf
@@ -1,7 +1,7 @@
 # Allwinner A20 dual core 1Gb RAM SoC 1xSATA GBE
 BOARD_NAME="Banana Pi"
 BOARDFAMILY="sun7i"
-BOARD_MAINTAINER="DylanHP"
+BOARD_MAINTAINER="janprunk"
 BOOTCONFIG="Bananapi_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 
diff --git a/config/boards/bananapim7.conf b/config/boards/bananapim7.conf
index ba7e6f409b6f..c74262e9c41d 100644
--- a/config/boards/bananapim7.conf
+++ b/config/boards/bananapim7.conf
@@ -4,5 +4,6 @@ BOARD_MAINTAINER="amazingfate"
 BOOT_FDT_FILE="rockchip/rk3588-bananapi-m7.dtb"
 # Those are included in armsom-sige7.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
 BOARD_MAINTAINER="Z-Keven"
-KERNEL_TARGET="vendor,edge,collabora"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 BOARDFAMILY="rockchip-rk3588"
diff --git a/config/boards/clearfogpro.csc b/config/boards/clearfogpro.csc
index 1117405fb362..36a3df4f9315 100644
--- a/config/boards/clearfogpro.csc
+++ b/config/boards/clearfogpro.csc
@@ -5,4 +5,4 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="clearfog_defconfig"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
diff --git a/config/boards/indiedroid-nova.csc b/config/boards/indiedroid-nova.csc
index 0ae33502b870..9b6ea989c178 100644
--- a/config/boards/indiedroid-nova.csc
+++ b/config/boards/indiedroid-nova.csc
@@ -4,7 +4,7 @@ declare -g BOARD_MAINTAINER="lanefu"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOOTCONFIG="indiedroid_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 declare -g BOOT_SOC="rk3588"
-declare -g KERNEL_TARGET="vendor,collabora,edge"
+declare -g KERNEL_TARGET="vendor,current,edge"
 declare -g FULL_DESKTOP="yes"
 declare -g BOOT_LOGO="desktop"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"
diff --git a/config/boards/khadas-edge2.conf b/config/boards/khadas-edge2.conf
index 1befb202a23e..4e8d6b27c1b2 100644
--- a/config/boards/khadas-edge2.conf
+++ b/config/boards/khadas-edge2.conf
@@ -1,10 +1,10 @@
 # Rockchip RK3588s 2GB-16GB GBE eMMC NVMe SATA USB3 WiFi
 declare -g BOARD_NAME="Khadas Edge2"
 declare -g BOARDFAMILY="rockchip-rk3588"
-declare -g BOARD_MAINTAINER="igorpecovnik"
+declare -g BOARD_MAINTAINER="efectn"
 declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
-declare -g KERNEL_TARGET="vendor,edge"
-declare -g KERNEL_TEST_TARGET="vendor"
+declare -g KERNEL_TARGET="vendor,current,edge"
+declare -g KERNEL_TEST_TARGET="vendor,current"
 declare -g IMAGE_PARTITION_TABLE="gpt"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb" # Specific to this board
 
diff --git a/config/boards/nanopc-cm3588-nas.csc b/config/boards/nanopc-cm3588-nas.csc
index 6b29392c7049..1327ff570a3e 100644
--- a/config/boards/nanopc-cm3588-nas.csc
+++ b/config/boards/nanopc-cm3588-nas.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopc_cm3588_defconfig" # Enables booting from NVMe. Vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,current,edge,collabora"
+KERNEL_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/boards/nanopct6.csc b/config/boards/nanopct6.conf
similarity index 98%
rename from config/boards/nanopct6.csc
rename to config/boards/nanopct6.conf
index 15a0949aa1c5..409b7ea0aa46 100644
--- a/config/boards/nanopct6.csc
+++ b/config/boards/nanopct6.conf
@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="Tonymac32"
 BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,current,edge,collabora"
-KERNEL_TEST_TARGET="vendor,edge"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb"
diff --git a/config/boards/nanopi-r4s.conf b/config/boards/nanopi-r4s.conf
index 0b0e20ce2901..602cb44293b6 100644
--- a/config/boards/nanopi-r4s.conf
+++ b/config/boards/nanopi-r4s.conf
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip64" # Used to be rk3399
 BOARD_MAINTAINER="Manouchehri"
 BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
 DEFAULT_CONSOLE="serial"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
 HAS_VIDEO_OUTPUT="no"
diff --git a/config/boards/nanopi-r6s.csc b/config/boards/nanopi-r6s.csc
index eed9a375bf46..bca43ecc4786 100644
--- a/config/boards/nanopi-r6s.csc
+++ b/config/boards/nanopi-r6s.csc
@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,edge"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/boards/nanopim4v2.csc b/config/boards/nanopim4v2.conf
similarity index 97%
rename from config/boards/nanopim4v2.csc
rename to config/boards/nanopim4v2.conf
index ba0cac1c17d0..2a87b8f5e179 100644
--- a/config/boards/nanopim4v2.csc
+++ b/config/boards/nanopim4v2.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3399 hexa core 4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
 BOARD_NAME="NanoPi M4V2"
 BOARDFAMILY="rockchip64" # Used to be rk3399
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="nanopi-m4v2-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
diff --git a/config/boards/odroidc4.csc b/config/boards/odroidc4.conf
similarity index 100%
rename from config/boards/odroidc4.csc
rename to config/boards/odroidc4.conf
diff --git a/config/boards/odroidhc4.csc b/config/boards/odroidhc4.conf
similarity index 100%
rename from config/boards/odroidhc4.csc
rename to config/boards/odroidhc4.conf
diff --git a/config/boards/odroidxu4.conf b/config/boards/odroidxu4.conf
index 31001215f582..1b1850012e2c 100644
--- a/config/boards/odroidxu4.conf
+++ b/config/boards/odroidxu4.conf
@@ -6,4 +6,4 @@ BOOTCONFIG="odroid-xu4_defconfig"
 SERIALCON="ttySAC2"
 KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
index 30a887a393be..54665c906c88 100644
--- a/config/boards/orangepi5-plus.conf
+++ b/config/boards/orangepi5-plus.conf
@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,edge"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb"
diff --git a/config/boards/orangepi5.conf b/config/boards/orangepi5.conf
index 33a329ceb4c1..e86962c1bee9 100644
--- a/config/boards/orangepi5.conf
+++ b/config/boards/orangepi5.conf
@@ -5,8 +5,8 @@ BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi-5-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOTCONFIG_SATA="orangepi-5-sata-rk3588s_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,edge"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb"
diff --git a/config/boards/orangepioneplus.csc b/config/boards/orangepioneplus.csc
index 6f82d63c03b6..89f3b2c069f0 100644
--- a/config/boards/orangepioneplus.csc
+++ b/config/boards/orangepioneplus.csc
@@ -4,5 +4,5 @@ BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi_one_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
 CRUSTCONFIG="orangepi_3_lts_defconfig"
diff --git a/config/boards/pinebook-pro.conf b/config/boards/pinebook-pro.csc
similarity index 100%
rename from config/boards/pinebook-pro.conf
rename to config/boards/pinebook-pro.csc
diff --git a/config/boards/rock-3a.csc b/config/boards/rock-3a.conf
similarity index 100%
rename from config/boards/rock-3a.csc
rename to config/boards/rock-3a.conf
diff --git a/config/boards/rock-5a.conf b/config/boards/rock-5a.conf
index 643904950d0d..8c010d52db72 100644
--- a/config/boards/rock-5a.conf
+++ b/config/boards/rock-5a.conf
@@ -3,7 +3,8 @@ BOARD_NAME="Rock 5A"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate"
 BOOTCONFIG="rock-5a-rk3588s_defconfig"
-KERNEL_TARGET="vendor,edge,collabora"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-rock-5a.dtb"
diff --git a/config/boards/rock-5b.conf b/config/boards/rock-5b.conf
index 9896b8e2c7b2..9fdea159ab00 100644
--- a/config/boards/rock-5b.conf
+++ b/config/boards/rock-5b.conf
@@ -3,8 +3,8 @@ BOARD_NAME="Rock 5B"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate linhz0hz"
 BOOTCONFIG="rock-5b-rk3588_defconfig"
-KERNEL_TARGET="vendor,edge,collabora"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
diff --git a/config/boards/rockpi-4b.csc b/config/boards/rockpi-4b.csc
index c72fe805445c..4387aadbe5a9 100644
--- a/config/boards/rockpi-4b.csc
+++ b/config/boards/rockpi-4b.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="rock-pi-4-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb"
diff --git a/config/boards/rockpro64.conf b/config/boards/rockpro64.csc
similarity index 100%
rename from config/boards/rockpro64.conf
rename to config/boards/rockpro64.csc