diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts
index f39936b71..8fcaa3dbe 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts
@@ -46,20 +46,18 @@
 		};
 	};
 
-	keys: keys {
+	keys {
 		compatible = "gpio-keys";
 
 		reset {
 			label = "reset";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
 			linux,code = <KEY_RESTART>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
@@ -110,25 +108,13 @@
 		};
 
 		partition@200000 {
-			label = "firmware";
-			compatible = "denx,uimage";
-			reg = <0x200000 0x1e00000>;
+			label = "kernel";
+			reg = <0x200000 0x400000>;
 		};
 
-		partition@2000000 {
-			label = "firmware1";
-			reg = <0x2000000 0x1e00000>;
-		};
-
-		partition@3e00000 {
+		partition@600000 {
 			label = "ubi";
-			reg = <0x3e00000 0x3200000>;
-		};
-
-		partition@7000000 {
-			label = "obr";
-			reg = <0x7000000 0x1000000>;
-			read-only;
+			reg = <0x600000 0x7980000>;
 		};
 	};
 };
@@ -140,17 +126,11 @@
 &pcie1 {
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
-		reg = <0x0 0 0 0 0>;
+		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&factory 0x0>;
 	};
 };
 
-&pcie2 {
-	wifi@0,0 {
-		reg = <0x0 0 0 0 0>;
-	};
-};
-
 &gmac0 {
 	mtd-mac-address = <&factory 0x3fff4>;
 };
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 2ba3a0c45..d7c460a63 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -1112,14 +1112,14 @@ define Device/xiaomi_mi-router-cr6606
   BLOCKSIZE := 128k
   PAGESIZE := 2048
   UBINIZE_OPTS := -E 5
-  IMAGE_SIZE := 51200k
-  IMAGES += firmware.bin overlay.bin
-  IMAGE/firmware.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs
-  IMAGE/overlay.bin := append-ubi | check-size
+  KERNEL_SIZE := 4096k
+  IMAGE_SIZE := 128512k
+  IMAGES += factory.bin
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size
   DEVICE_VENDOR := Xiaomi
   DEVICE_MODEL := Mi Router CR6606
-  DEVICE_PACKAGES += uboot-envtools kmod-mt7915e wpad-openssl
+  DEVICE_PACKAGES += kmod-mt7915e wpad-openssl uboot-envtools
 endef
 TARGET_DEVICES += xiaomi_mi-router-cr6606