diff --git a/config/boards/cubieboard4.csc b/config/boards/cubieboard4.csc
index f9cb60967c..56983de5de 100644
--- a/config/boards/cubieboard4.csc
+++ b/config/boards/cubieboard4.csc
@@ -1,6 +1,6 @@
 # Allwinner A80 SoC 8 cores 2GB RAM Wi-Fi
 BOARD_NAME="Cubieboard 4"
-BOARDFAMILY=sun9i
+BOARDFAMILY="sun9i"
 BOARD_MAINTAINER=""
 BOOTCONFIG=Cubieboard4_defconfig
 KERNEL_TARGET="current,edge"
diff --git a/config/boards/indiedroid-nova.csc b/config/boards/indiedroid-nova.csc
index c434c3f58d..debb21f6c7 100644
--- a/config/boards/indiedroid-nova.csc
+++ b/config/boards/indiedroid-nova.csc
@@ -1,5 +1,6 @@
 # Rockchip RK3588S octa core 4/8/16GB RAM SoC eMMC USB3 USB-C GbE
 declare -g BOARD_NAME="Indiedroid Nova"
+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"
@@ -12,14 +13,13 @@ declare -g BOOT_SUPPORT_SPI="no"
 declare -g IMAGE_PARTITION_TABLE="gpt"
 declare -g SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
 declare -g BOOTFS_TYPE="fat"
-declare -g SRC_EXTLINUX="no"     # going back to standard uboot for now
+declare -g SRC_EXTLINUX="no" # going back to standard uboot for now
 declare -g BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
 declare -g DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
 
 ## only applies to extlinux so not used
 declare -g SRC_CMDLINE="console=ttyS0,115200n8 console=tty1 console=both net.ifnames=0 rootflags=data=writeback"
 
-
 # Override family config for this board; let's avoid conditionals in family config.
 function post_family_config__indiedroid-nova_use_stvhay_uboot() {
 	declare -g BOOTSOURCE='https://github.com/stvhay/u-boot.git'
@@ -29,9 +29,7 @@ function post_family_config__indiedroid-nova_use_stvhay_uboot() {
 
 # BSP kernel uses device name from contract manufacturer rather than production name in mainline
 function post_family_config_branch_legacy__use_9tripod_dtb() {
-
-        declare -g BOOT_FDT_FILE="rockchip/rk3588s-9tripod-linux.dtb"
-
+	declare -g BOOT_FDT_FILE="rockchip/rk3588s-9tripod-linux.dtb"
 }
 
 # Add bluetooth packages to the image (not rootfs cache)
@@ -48,16 +46,16 @@ function pre_customize_image__indiedroid_add_bluetooth() {
 	# Build firmware
 	TMPDIR=$(mktemp -d)
 	pushd "${TMPDIR}" || exit 1
-		git clone https://github.com/stvhay/rkwifibt || exit 1
-		cd rkwifibt                                  || exit 1
-		make -C realtek/rtk_hciattach                || exit 1
-		# Install the firmware and utility
-		mkdir -p "${SDCARD}/lib/firmware/rtl_bt"
-		cp -fr realtek/RTL8821CS/*                 "${SDCARD}/lib/firmware/rtl_bt/"
-		cp -f  realtek/rtk_hciattach/rtk_hciattach "${SDCARD}/usr/bin/"
-		cp -f  bt_load_rtk_firmware                "${SDCARD}/usr/bin/"
-		chroot_sdcard chmod +x /usr/bin/{rtk_hciattach,bt_load_rtk_firmware}
-		echo hci_uart >> "${SDCARD}/etc/modules"
+	git clone https://github.com/stvhay/rkwifibt || exit 1
+	cd rkwifibt || exit 1
+	make -C realtek/rtk_hciattach || exit 1
+	# Install the firmware and utility
+	mkdir -p "${SDCARD}/lib/firmware/rtl_bt"
+	cp -fr realtek/RTL8821CS/* "${SDCARD}/lib/firmware/rtl_bt/"
+	cp -f realtek/rtk_hciattach/rtk_hciattach "${SDCARD}/usr/bin/"
+	cp -f bt_load_rtk_firmware "${SDCARD}/usr/bin/"
+	chroot_sdcard chmod +x /usr/bin/{rtk_hciattach,bt_load_rtk_firmware}
+	echo hci_uart >> "${SDCARD}/etc/modules"
 	popd || exit 1
 
 	#TODO this should probably be replaced with the existing extensions/bluetooth-hciattach.sh
diff --git a/config/boards/mixtile-blade3.wip b/config/boards/mixtile-blade3.wip
index 6a10e1922c..ee808a4630 100644
--- a/config/boards/mixtile-blade3.wip
+++ b/config/boards/mixtile-blade3.wip
@@ -1,6 +1,7 @@
 # Rockchip RK3588 SoC octa core 16GB 4x PCIe Gen3 HDMI USB3 DP HDMIrx eMMC SD PD Mini-PCIe
 declare -g BOARD_NAME="Mixtile Blade 3"
 declare -g BOARDFAMILY="rockchip-rk3588"
+declare -g BOARD_MAINTAINER="rpardini"
 declare -g KERNEL_TARGET="legacy"
 declare -g BOOT_FDT_FILE="rockchip/rk3588-blade3-v101-linux.dtb" # Included in https://github.com/armbian/linux-rockchip/pull/64
 
diff --git a/config/boards/thinkpad-x13s.wip b/config/boards/thinkpad-x13s.wip
index 682d49dab4..c8a20f7a87 100644
--- a/config/boards/thinkpad-x13s.wip
+++ b/config/boards/thinkpad-x13s.wip
@@ -1,5 +1,6 @@
 # Qualcomm Snapdragon 8cx Gen 3 Adreno 690 Qualcomm WCN685x Wi-Fi 6E Qualcomm Snapdragon X55 5G Bluetooth 5.1
 declare -g BOARD_NAME="ThinkPad X13s"
+declare -g BOARD_MAINTAINER="rpardini"
 declare -g BOARDFAMILY="uefi-arm64"
 declare -g KERNEL_TARGET="sc8280xp"