diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-snfi-nand-2500wan-p5.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-snfi-nand-2500wan-p5.dts
index ad1dbfa..ea663eb 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-snfi-nand-2500wan-p5.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-snfi-nand-2500wan-p5.dts
@@ -2,7 +2,7 @@
 #include "mt7981.dtsi"
 / {
 	model = "MediaTek MT7981 RFB";
-	compatible = "mediatek,mt7981-snand-pcie-2500wan-p5-rfb";
+	compatible = "mediatek,mt7981-snfi-snand-pcie-2500wan-p5-rfb";
 	chosen {
 		bootargs = "console=ttyS0,115200n1 loglevel=8  \
 				earlycon=uart8250,mmio32,0x11002000";
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-spim-nand-2500wan-gmac2.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-spim-nand-2500wan-gmac2.dts
index 904d529..6c24709 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-spim-nand-2500wan-gmac2.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-spim-nand-2500wan-gmac2.dts
@@ -2,7 +2,7 @@
 #include "mt7981.dtsi"
 / {
 	model = "MediaTek MT7981 RFB";
-	compatible = "mediatek,mt7981-spim-snand-rfb";
+	compatible = "mediatek,mt7981-spim-snand-2500wan-gmac2-rfb";
 	chosen {
 		bootargs = "console=ttyS0,115200n1 loglevel=8  \
 				earlycon=uart8250,mmio32,0x11002000";
diff --git a/target/linux/mediatek/image/mt7981.mk b/target/linux/mediatek/image/mt7981.mk
index 86067d2..ab3ed5b 100755
--- a/target/linux/mediatek/image/mt7981.mk
+++ b/target/linux/mediatek/image/mt7981.mk
@@ -5,6 +5,7 @@
   DEVICE_MODEL := mt7981-spim-nor-rfb
   DEVICE_DTS := mt7981-spim-nor-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
+  SUPPORTED_DEVICES := mediatek,mt7981-spim-nor-rfb
 endef
 TARGET_DEVICES += mt7981-spim-nor-rfb
 
@@ -13,7 +14,7 @@
   DEVICE_MODEL := mt7981-spim-nand-2500wan-gmac2
   DEVICE_DTS := mt7981-spim-nand-2500wan-gmac2
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7981-rfb,ubi
+  SUPPORTED_DEVICES := mediatek,mt7981-spim-snand-2500wan-gmac2-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -30,7 +31,7 @@
   DEVICE_MODEL := mt7981-spim-nand-rfb
   DEVICE_DTS := mt7981-spim-nand-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7981-rfb,ubi
+  SUPPORTED_DEVICES := mediatek,mt7981-spim-snand-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -90,7 +91,7 @@
   DEVICE_MODEL := mt7981-snfi-nand-2500wan-p5
   DEVICE_DTS := mt7981-snfi-nand-2500wan-p5
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7981-rfb,ubi
+  SUPPORTED_DEVICES := mediatek,mt7981-snfi-snand-pcie-2500wan-p5-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -107,6 +108,7 @@
   DEVICE_MODEL := mt7981-fpga-spim-nor
   DEVICE_DTS := mt7981-fpga-spim-nor
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
+  SUPPORTED_DEVICES := mediatek,mt7981-fpga-nor
 endef
 TARGET_DEVICES += mt7981-fpga-spim-nor
 
@@ -115,7 +117,7 @@
   DEVICE_MODEL := mt7981-fpga-snfi-nand
   DEVICE_DTS := mt7981-fpga-snfi-nand
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7981-fpga,ubi
+  SUPPORTED_DEVICES := mediatek,mt7981-fpga-snfi-snand
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -132,7 +134,7 @@
   DEVICE_MODEL := mt7981-fpga-spim-nand
   DEVICE_DTS := mt7981-fpga-spim-nand
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7981-fpga,ubi
+  SUPPORTED_DEVICES := mediatek,mt7981-fpga-spim-snand
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048