diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
index ddf9b9804a..74572676e8 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -22,17 +22,14 @@ mediatek_setup_interfaces()
 		;;
 	asus,tuf-ax4200|\
 	mediatek,mt7981-rfb|\
-	zbtlink,zbt-z8102ax)
+	zbtlink,zbt-z8102ax|\
+	zyxel,ex5601-t0-stock|\
+	zyxel,ex5601-t0-ubootmod)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1
 		;;
 	asus,tuf-ax6000)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1
 		;;
-	netgear,wax220|\
-	ubnt,unifi-6-plus|\
-	zyxel,nwa50ax-pro)
-		ucidef_set_interface_lan "eth0"
-		;;
 	bananapi,bpi-r3)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "eth1 wan"
 		;;
@@ -53,6 +50,11 @@ mediatek_setup_interfaces()
 	glinet,gl-mt3000)
 		ucidef_set_interfaces_lan_wan eth1 eth0
 		;;
+	glinet,gl-mt6000|\
+	tplink,tl-xdr4288|\
+	tplink,tl-xdr6088)
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1
+		;;
 	mediatek,mt7986a-rfb)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan6" "eth1 wan"
 		;;
@@ -65,10 +67,10 @@ mediatek_setup_interfaces()
 	mercusys,mr90x-v1)
 		ucidef_set_interfaces_lan_wan "lan0 lan1 lan2" eth1
 		;;
-	glinet,gl-mt6000|\
-	tplink,tl-xdr4288|\
-	tplink,tl-xdr6088)
-		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1
+	netgear,wax220|\
+	ubnt,unifi-6-plus|\
+	zyxel,nwa50ax-pro)
+		ucidef_set_interface_lan "eth0"
 		;;
 	tplink,tl-xdr6086)
 		ucidef_set_interfaces_lan_wan "lan1 lan2" eth1
@@ -81,10 +83,6 @@ mediatek_setup_interfaces()
 	xiaomi,redmi-router-ax6000-ubootmod)
 		ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" wan
 		;;
-	zyxel,ex5601-t0-stock|\
-	zyxel,ex5601-t0-ubootmod)
-		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1
-		;;
 	*)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan
 		;;
diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
index 7683bbd757..0a45b18042 100644
--- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
+++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
@@ -111,11 +111,6 @@ case "$board" in
 		[ "$PHYNBR" = "0" ] && macaddr_add $hw_mac_addr 2 > /sys${DEVPATH}/macaddress
 		[ "$PHYNBR" = "1" ] && macaddr_add $hw_mac_addr 3 > /sys${DEVPATH}/macaddress
 		;;
-	ubnt,unifi-6-plus)
-		addr=$(mtd_get_mac_binary EEPROM 0x6)
-		[ "$PHYNBR" = "0" ] && echo "$addr" > /sys${DEVPATH}/macaddress
-		[ "$PHYNBR" = "1" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress
-		;;
 	qihoo,360t7)
 		addr=$(mtd_get_mac_ascii factory lanMac)
 		[ "$PHYNBR" = "0" ] && macaddr_add $addr 2 > /sys${DEVPATH}/macaddress
@@ -131,6 +126,11 @@ case "$board" in
 	tplink,tl-xdr6088)
 		[ "$PHYNBR" = "0" ] && get_mac_label > /sys${DEVPATH}/macaddress
 		;;
+	ubnt,unifi-6-plus)
+		addr=$(mtd_get_mac_binary EEPROM 0x6)
+		[ "$PHYNBR" = "0" ] && echo "$addr" > /sys${DEVPATH}/macaddress
+		[ "$PHYNBR" = "1" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress
+		;;
 	zbtlink,zbt-z8102ax|\
 	zyxel,ex5601-t0|\
 	zyxel,ex5601-t0-ubootmod)
diff --git a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
index aa990b7d61..4d7b6d3c22 100755
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -104,15 +104,6 @@ platform_do_upgrade() {
 	cudy,wr3000-v1)
 		default_do_upgrade "$1"
 		;;
-	mercusys,mr90x-v1)
-		CI_UBIPART="ubi0"
-		nand_do_upgrade "$1"
-		;;
-	ubnt,unifi-6-plus)
-		CI_KERNPART="kernel0"
-		EMMC_ROOT_DEV="$(cmdline_get_var root)"
-		emmc_do_upgrade "$1"
-		;;
 	h3c,magic-nx30-pro|\
 	jcg,q30|\
 	mediatek,mt7981-rfb|\
@@ -125,17 +116,26 @@ platform_do_upgrade() {
 		CI_KERNPART="fit"
 		nand_do_upgrade "$1"
 		;;
+	mercusys,mr90x-v1)
+		CI_UBIPART="ubi0"
+		nand_do_upgrade "$1"
+		;;
+	ubnt,unifi-6-plus)
+		CI_KERNPART="kernel0"
+		EMMC_ROOT_DEV="$(cmdline_get_var root)"
+		emmc_do_upgrade "$1"
+		;;
 	xiaomi,mi-router-wr30u-stock|\
 	xiaomi,redmi-router-ax6000-stock)
 		CI_KERN_UBIPART=ubi_kernel
 		CI_ROOT_UBIPART=ubi
 		nand_do_upgrade "$1"
 		;;
-        zyxel,ex5601-t0-ubootmod)
+	zyxel,ex5601-t0-ubootmod)
 		CI_KERNPART="fit"
 		CI_ROOTPART="ubi_rootfs"
-                nand_do_upgrade "$1"
-                ;;
+		nand_do_upgrade "$1"
+		;;
 	*)
 		nand_do_upgrade "$1"
 		;;
@@ -171,6 +171,12 @@ platform_check_image() {
 
 platform_copy_config() {
 	case "$(board_name)" in
+	acer,predator-w6|\
+	cmcc,rax3000m-emmc-ubootmod|\
+	glinet,gl-mt6000|\
+	ubnt,unifi-6-plus)
+		emmc_copy_config
+		;;
 	bananapi,bpi-r3|\
 	bananapi,bpi-r3-mini|\
 	cmcc,rax3000m)
@@ -180,11 +186,6 @@ platform_copy_config() {
 			;;
 		esac
 		;;
-	cmcc,rax3000m-emmc-ubootmod|\
-	glinet,gl-mt6000|\
-	ubnt,unifi-6-plus)
-		emmc_copy_config
-		;;
 	esac
 }
 
diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index 5df654e67f..90c08a03e1 100644
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -111,6 +111,22 @@ define Device/abt_asr3000-ubootmod
 endef
 TARGET_DEVICES += abt_asr3000-ubootmod
 
+define Device/acer_predator-w6
+  DEVICE_VENDOR := Acer
+  DEVICE_MODEL := Predator W6
+  DEVICE_DTS := mt7986a-acer-predator-w6
+  DEVICE_DTS_DIR := ../dts
+  DEVICE_DTS_LOADADDR := 0x47000000
+  DEVICE_PACKAGES := kmod-usb3 kmod-mt7986-firmware kmod-mt7916-firmware \
+	mt7986-wo-firmware f2fsck mkf2fs automount
+  IMAGES := sysupgrade.bin
+  KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
+  KERNEL_INITRAMFS := kernel-bin | lzma | \
+	fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+endef
+TARGET_DEVICES += acer_predator-w6
+
 define Device/asus_tuf-ax4200
   DEVICE_VENDOR := ASUS
   DEVICE_MODEL := TUF-AX4200
@@ -143,21 +159,6 @@ define Device/asus_tuf-ax6000
 endef
 TARGET_DEVICES += asus_tuf-ax6000
 
-define Device/acer_predator-w6
-  DEVICE_VENDOR := Acer
-  DEVICE_MODEL := Predator W6
-  DEVICE_DTS := mt7986a-acer-predator-w6
-  DEVICE_DTS_DIR := ../dts
-  DEVICE_DTS_LOADADDR := 0x47000000
-  DEVICE_PACKAGES := kmod-usb3 kmod-mt7986-firmware kmod-mt7916-firmware mt7986-wo-firmware e2fsprogs f2fsck mkf2fs
-  IMAGES := sysupgrade.bin
-  KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
-  KERNEL_INITRAMFS := kernel-bin | lzma | \
-	fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-endef
-TARGET_DEVICES += acer_predator-w6
-
 define Device/bananapi_bpi-r3
   DEVICE_VENDOR := Bananapi
   DEVICE_MODEL := BPi-R3
@@ -245,7 +246,8 @@ TARGET_DEVICES += bananapi_bpi-r3-mini
 
 define Device/cetron_ct3003-ubootmod
   DEVICE_VENDOR := Cetron
-  DEVICE_MODEL := CT3003 (custom U-Boot layout)
+  DEVICE_MODEL := CT3003
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7981b-cetron-ct3003-ubootmod
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware
@@ -266,7 +268,8 @@ TARGET_DEVICES += cetron_ct3003-ubootmod
 
 define Device/cmcc_a10-ubootmod
   DEVICE_VENDOR := CMCC
-  DEVICE_MODEL := A10 (custom U-Boot layout)
+  DEVICE_MODEL := A10
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7981b-cmcc-a10-ubootmod
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware
@@ -287,7 +290,8 @@ TARGET_DEVICES += cmcc_a10-ubootmod
 
 define Device/cmcc_rax3000m
   DEVICE_VENDOR := CMCC
-  DEVICE_MODEL := RAX3000M (OpenWrt U-Boot layout)
+  DEVICE_MODEL := RAX3000M
+  DEVICE_VARIANT := (OpenWrt U-Boot layout)
   DEVICE_DTS := mt7981b-cmcc-rax3000m
   DEVICE_DTS_OVERLAY := mt7981b-cmcc-rax3000m-emmc mt7981b-cmcc-rax3000m-nand
   DEVICE_DTS_DIR := ../dts
@@ -320,7 +324,8 @@ TARGET_DEVICES += cmcc_rax3000m
 
 define Device/cmcc_rax3000m-emmc-ubootmod
   DEVICE_VENDOR := CMCC
-  DEVICE_MODEL := RAX3000M eMMC version (custom U-Boot layout)
+  DEVICE_MODEL := RAX3000M eMMC version
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7981b-cmcc-rax3000m-emmc-ubootmod
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware kmod-usb3 \
@@ -334,7 +339,8 @@ TARGET_DEVICES += cmcc_rax3000m-emmc-ubootmod
 
 define Device/cmcc_rax3000m-nand-ubootmod
   DEVICE_VENDOR := CMCC
-  DEVICE_MODEL := RAX3000M NAND version (custom U-Boot layout)
+  DEVICE_MODEL := RAX3000M NAND version
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7981b-cmcc-rax3000m-nand-ubootmod
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware \
@@ -408,7 +414,8 @@ TARGET_DEVICES += glinet_gl-mt6000
 
 define Device/h3c_magic-nx30-pro
   DEVICE_VENDOR := H3C
-  DEVICE_MODEL := Magic NX30 Pro (OpenWrt U-Boot layout)
+  DEVICE_MODEL := Magic NX30 Pro
+  DEVICE_VARIANT := (OpenWrt U-Boot layout)
   DEVICE_DTS := mt7981b-h3c-magic-nx30-pro
   DEVICE_DTS_DIR := ../dts
   UBINIZE_OPTS := -E 5
@@ -433,7 +440,8 @@ TARGET_DEVICES += h3c_magic-nx30-pro
 
 define Device/h3c_magic-nx30-pro-nmbm
   DEVICE_VENDOR := H3C
-  DEVICE_MODEL := Magic NX30 Pro (NMBM layout)
+  DEVICE_MODEL := Magic NX30 Pro
+  DEVICE_VARIANT := (NMBM layout)
   DEVICE_DTS := mt7981b-h3c-magic-nx30-pro-nmbm
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware
@@ -454,7 +462,8 @@ TARGET_DEVICES += h3c_magic-nx30-pro-nmbm
 
 define Device/imou_lc-hx3001-ubootmod
   DEVICE_VENDOR := Imou
-  DEVICE_MODEL := LC-HX3001 (custom U-Boot layout)
+  DEVICE_MODEL := LC-HX3001
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7981b-imou-lc-hx3001-ubootmod
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware
@@ -476,11 +485,14 @@ TARGET_DEVICES += imou_lc-hx3001-ubootmod
 
 define Device/jcg_q30
   DEVICE_VENDOR := JCG
-  DEVICE_MODEL := Q30 (OpenWrt U-Boot layout)
+  DEVICE_MODEL := Q30
+  DEVICE_VARIANT := (OpenWrt U-Boot layout)
   DEVICE_ALT0_VENDOR := JCG
-  DEVICE_ALT0_MODEL := Q30 Pro (OpenWrt U-Boot layout)
+  DEVICE_ALT0_MODEL := Q30 Pro
+  DEVICE_ALT0_VARIANT := (OpenWrt U-Boot layout)
   DEVICE_ALT1_VENDOR := CMCC
-  DEVICE_ALT1_MODEL := MR3000D-CIq (OpenWrt U-Boot layout)
+  DEVICE_ALT1_MODEL := MR3000D-CIq
+  DEVICE_ALT1_VARIANT := (OpenWrt U-Boot layout)
   SUPPORTED_DEVICES += jcg,q30-pro
   DEVICE_DTS := mt7981b-jcg-q30
   DEVICE_DTS_DIR := ../dts
@@ -505,11 +517,14 @@ TARGET_DEVICES += jcg_q30
 
 define Device/jcg_q30-ubootmod
   DEVICE_VENDOR := JCG
-  DEVICE_MODEL := Q30 (custom U-Boot layout)
+  DEVICE_MODEL := Q30
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_ALT0_VENDOR := JCG
-  DEVICE_ALT0_MODEL := Q30 Pro (custom U-Boot layout)
+  DEVICE_ALT0_MODEL := Q30 Pro
+  DEVICE_ALT0_VARIANT := (custom U-Boot layout)
   DEVICE_ALT1_VENDOR := CMCC
-  DEVICE_ALT1_MODEL := MR3000D-CIq (custom U-Boot layout)
+  DEVICE_ALT1_MODEL := MR3000D-CIq
+  DEVICE_ALT1_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7981b-jcg-q30-ubootmod
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware
@@ -530,6 +545,7 @@ TARGET_DEVICES += jcg_q30-ubootmod
 
 define Device/livinet_zr-3020-common
   DEVICE_VENDOR := Livinet
+  DEVICE_MODEL := ZR-3020
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware
   UBINIZE_OPTS := -E 5
@@ -546,7 +562,7 @@ define Device/livinet_zr-3020-common
 endef
 
 define Device/livinet_zr-3020
-  DEVICE_MODEL := ZR-3020 (stock layout)
+  DEVICE_VARIANT := (stock layout)
   DEVICE_DTS := mt7981b-livinet-zr-3020
   SUPPORTED_DEVICES += mediatek,mt7981-spim-snand-gsw-rfb
   IMAGE_SIZE := 65536k
@@ -555,31 +571,13 @@ endef
 TARGET_DEVICES += livinet_zr-3020
 
 define Device/livinet_zr-3020-ubootmod
-  DEVICE_MODEL := ZR-3020 (custom U-Boot layout)
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7981b-livinet-zr-3020-ubootmod
   IMAGE_SIZE := 98304k
   $(call Device/livinet_zr-3020-common)
 endef
 TARGET_DEVICES += livinet_zr-3020-ubootmod
 
-define Device/netgear_wax220
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := WAX220
-  DEVICE_DTS := mt7986b-netgear-wax220
-  DEVICE_DTS_DIR := ../dts
-  NETGEAR_ENC_MODEL := WAX220
-  NETGEAR_ENC_REGION := US
-  DEVICE_PACKAGES := kmod-mt7986-firmware mt7986-wo-firmware
-  KERNEL_INITRAMFS_SUFFIX := -recovery.itb
-  IMAGE_SIZE := 32768k
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-  IMAGES += factory.img
-  # Padding to 10M seems to be required by OEM web interface
-  IMAGE/factory.img := sysupgrade-tar | \
-	  pad-to 10M | check-size | netgear-encrypted-factory
-endef
-TARGET_DEVICES += netgear_wax220
-
 define Device/mediatek_mt7981-rfb
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7981 rfb
@@ -751,9 +749,28 @@ define Device/mercusys_mr90x-v1
 endef
 TARGET_DEVICES += mercusys_mr90x-v1
 
+define Device/netgear_wax220
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WAX220
+  DEVICE_DTS := mt7986b-netgear-wax220
+  DEVICE_DTS_DIR := ../dts
+  NETGEAR_ENC_MODEL := WAX220
+  NETGEAR_ENC_REGION := US
+  DEVICE_PACKAGES := kmod-mt7986-firmware mt7986-wo-firmware
+  KERNEL_INITRAMFS_SUFFIX := -recovery.itb
+  IMAGE_SIZE := 32768k
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGES += factory.img
+  # Padding to 10M seems to be required by OEM web interface
+  IMAGE/factory.img := sysupgrade-tar | \
+	  pad-to 10M | check-size | netgear-encrypted-factory
+endef
+TARGET_DEVICES += netgear_wax220
+
 define Device/qihoo_360t7
   DEVICE_VENDOR := Qihoo
-  DEVICE_MODEL := 360T7 (OpenWrt U-Boot layout)
+  DEVICE_MODEL := 360T7
+  DEVICE_VARIANT := (OpenWrt U-Boot layout)
   DEVICE_DTS := mt7981b-qihoo-360t7
   DEVICE_DTS_DIR := ../dts
   UBINIZE_OPTS := -E 5
@@ -777,7 +794,8 @@ TARGET_DEVICES += qihoo_360t7
 
 define Device/qihoo_360t7-ubootmod
   DEVICE_VENDOR := Qihoo
-  DEVICE_MODEL := 360T7 (custom U-Boot layout)
+  DEVICE_MODEL := 360T7
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7981b-qihoo-360t7-ubootmod
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware
@@ -853,7 +871,8 @@ TARGET_DEVICES += ubnt_unifi-6-plus
 
 define Device/xiaomi_mi-router-wr30u-112m-nmbm
   DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := Mi Router WR30U (custom U-Boot layout)
+  DEVICE_MODEL := Mi Router WR30U
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7981b-xiaomi-mi-router-wr30u-112m-nmbm
   DEVICE_DTS_DIR := ../dts
   UBINIZE_OPTS := -E 5
@@ -874,7 +893,8 @@ TARGET_DEVICES += xiaomi_mi-router-wr30u-112m-nmbm
 
 define Device/xiaomi_mi-router-wr30u-stock
   DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := Mi Router WR30U (stock layout)
+  DEVICE_MODEL := Mi Router WR30U
+  DEVICE_VARIANT := (stock layout)
   DEVICE_DTS := mt7981b-xiaomi-mi-router-wr30u-stock
   DEVICE_DTS_DIR := ../dts
   UBINIZE_OPTS := -E 5
@@ -891,7 +911,8 @@ TARGET_DEVICES += xiaomi_mi-router-wr30u-stock
 
 define Device/xiaomi_mi-router-wr30u-ubootmod
   DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := Mi Router WR30U (OpenWrt U-Boot layout)
+  DEVICE_MODEL := Mi Router WR30U
+  DEVICE_VARIANT := (OpenWrt U-Boot layout)
   DEVICE_DTS := mt7981b-xiaomi-mi-router-wr30u-ubootmod
   DEVICE_DTS_DIR := ../dts
   UBINIZE_OPTS := -E 5
@@ -919,7 +940,8 @@ TARGET_DEVICES += xiaomi_mi-router-wr30u-ubootmod
 
 define Device/xiaomi_redmi-router-ax6000
   DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := Redmi Router AX6000 (custom U-Boot layout)
+  DEVICE_MODEL := Redmi Router AX6000
+  DEVICE_VARIANT := (custom U-Boot layout)
   DEVICE_DTS := mt7986a-xiaomi-redmi-router-ax6000
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-leds-ws2812b kmod-mt7986-firmware mt7986-wo-firmware
@@ -937,7 +959,8 @@ TARGET_DEVICES += xiaomi_redmi-router-ax6000
 
 define Device/xiaomi_redmi-router-ax6000-stock
   DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := Redmi Router AX6000 (stock layout)
+  DEVICE_MODEL := Redmi Router AX6000
+  DEVICE_VARIANT := (stock layout)
   DEVICE_DTS := mt7986a-xiaomi-redmi-router-ax6000-stock
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-leds-ws2812b kmod-mt7986-firmware mt7986-wo-firmware
@@ -954,7 +977,8 @@ TARGET_DEVICES += xiaomi_redmi-router-ax6000-stock
 
 define Device/xiaomi_redmi-router-ax6000-ubootmod
   DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := Redmi Router AX6000 (OpenWrt U-Boot layout)
+  DEVICE_MODEL := Redmi Router AX6000
+  DEVICE_VARIANT := (OpenWrt U-Boot layout)
   DEVICE_DTS := mt7986a-xiaomi-redmi-router-ax6000-ubootmod
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-leds-ws2812b kmod-mt7986-firmware mt7986-wo-firmware
@@ -1003,8 +1027,7 @@ define Device/zyxel_ex5601-t0-stock
   DEVICE_VARIANT := (stock layout)
   DEVICE_DTS := mt7986a-zyxel-ex5601-t0-stock
   DEVICE_DTS_DIR := ../dts
-  DEVICE_PACKAGES := kmod-mt7986-firmware mt7986-wo-firmware \
-	kmod-usb3 automount
+  DEVICE_PACKAGES := kmod-mt7986-firmware mt7986-wo-firmware kmod-usb3 automount
   SUPPORTED_DEVICES := mediatek,mt7986a-rfb-snand
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256k
@@ -1027,8 +1050,7 @@ define Device/zyxel_ex5601-t0-ubootmod
   DEVICE_VARIANT := (OpenWrt U-Boot layout)
   DEVICE_DTS := mt7986a-zyxel-ex5601-t0-ubootmod
   DEVICE_DTS_DIR := ../dts
-  DEVICE_PACKAGES := kmod-mt7986-firmware mt7986-wo-firmware \
-	kmod-usb3 automount
+  DEVICE_PACKAGES := kmod-mt7986-firmware mt7986-wo-firmware kmod-usb3 automount
   KERNEL_INITRAMFS_SUFFIX := -recovery.itb
   IMAGES := sysupgrade.itb
   UBINIZE_OPTS := -E 5
@@ -1056,7 +1078,8 @@ define Device/zyxel_ex5700-telenor
   DEVICE_MODEL := EX5700 (Telenor)
   DEVICE_DTS := mt7986a-zyxel-ex5700-telenor
   DEVICE_DTS_DIR := ../dts
-  DEVICE_PACKAGES := kmod-mt7916-firmware kmod-ubootenv-nvram kmod-usb3 kmod-mt7986-firmware mt7986-wo-firmware
+  DEVICE_PACKAGES := kmod-mt7916-firmware kmod-ubootenv-nvram kmod-usb3 \
+	kmod-mt7986-firmware mt7986-wo-firmware automount
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048