diff --git a/patches/0058-ramips-mt7621-add-mt7621-indio-um-305ax.patch b/patches-24.10/0046-ramips-add-mt7621_indio_um-305ax.patch
similarity index 73%
rename from patches/0058-ramips-mt7621-add-mt7621-indio-um-305ax.patch
rename to patches-24.10/0046-ramips-add-mt7621_indio_um-305ax.patch
index e358fd8c2..40d3c369d 100644
--- a/patches/0058-ramips-mt7621-add-mt7621-indio-um-305ax.patch
+++ b/patches-24.10/0046-ramips-add-mt7621_indio_um-305ax.patch
@@ -1,7 +1,9 @@
-From 937c4ba769b4d3a0b5cb804e54fd8bece8efac47 Mon Sep 17 00:00:00 2001
-From: Shubham Vishwakarma <shubhamvis98@fossfrog.in>
-Date: Mon, 29 Sep 2025 10:35:54 +0530
-Subject: [PATCH 58/68] ramips: mt7621: add mt7621 indio um-305ax
+From f080eb00b830b46afee62a6015add5132688cf3c Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 1 Aug 2025 09:28:28 +0200
+Subject: [PATCH 46/55] ramips: add mt7621_indio_um-305ax
+
+Adds device support for Indio UM-305AX indoor access point with MT7621 SoC and MT7915 wireless.
 
 Changelog:
 - Fix MAC address assignment for Ethernet ports
@@ -11,54 +13,13 @@ Changelog:
 
 Signed-off-by: Shubham Vishwakarma <shubhamvis98@fossfrog.in>
 ---
- target/linux/ath79/image/generic.mk           |  22 +--
- .../ramips/dts/mt7621_indio_um-305ax.dts      | 168 ++++++++++++++++++
+ .../ramips/dts/mt7621_indio_um-305ax.dts      | 146 ++++++++++++++++++
  target/linux/ramips/image/mt7621.mk           |  11 ++
  .../mt7621/base-files/etc/board.d/02_network  |   6 +
  .../etc/hotplug.d/ieee80211/10_fix_wifi_mac   |   6 +
- 5 files changed, 202 insertions(+), 11 deletions(-)
+ 4 files changed, 169 insertions(+)
  create mode 100644 target/linux/ramips/dts/mt7621_indio_um-305ax.dts
 
-diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index 5882feafcb..a98a5e816f 100644
---- a/target/linux/ath79/image/generic.mk
-+++ b/target/linux/ath79/image/generic.mk
-@@ -1627,6 +1627,17 @@ define Device/hiwifi_hc6361
- endef
- TARGET_DEVICES += hiwifi_hc6361
- 
-+define Device/indio_um-305ac
-+  SOC := qca9531
-+  DEVICE_VENDOR := Indio Network
-+  DEVICE_MODEL := UM-305AC
-+  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887
-+  IMAGE_SIZE := 16000k
-+  IMAGES += tftp.bin
-+  IMAGE/tftp.bin := $$(IMAGE/sysupgrade.bin) | yuncore-tftp-header-16m
-+endef
-+TARGET_DEVICES += indio_um-305ac
-+
- define Device/iodata_etg3-r
-   SOC := ar9342
-   DEVICE_VENDOR := I-O DATA
-@@ -2991,17 +3002,6 @@ define Device/yuncore_a770
- endef
- TARGET_DEVICES += yuncore_a770
- 
--define Device/indio_um-305ac
--  SOC := qca9531
--  DEVICE_VENDOR := Indio Network
--  DEVICE_MODEL := UM-305AC
--  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887
--  IMAGE_SIZE := 16000k
--  IMAGES += tftp.bin
--  IMAGE/tftp.bin := $$(IMAGE/sysupgrade.bin) | yuncore-tftp-header-16m
--endef
--TARGET_DEVICES += indio_um-305ac
--
- define Device/yuncore_a782
-   SOC := qca9563
-   DEVICE_VENDOR := YunCore
 diff --git a/target/linux/ramips/dts/mt7621_indio_um-305ax.dts b/target/linux/ramips/dts/mt7621_indio_um-305ax.dts
 new file mode 100644
 index 0000000000..42837dd9fe
@@ -234,10 +195,10 @@ index 0000000000..42837dd9fe
 +};
 +
 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index 962d7ef440..8790a2fa50 100644
+index f6a05db8d3..7df573ff19 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
-@@ -1148,6 +1148,17 @@ define Device/huasifei_ws1208v2
+@@ -1572,6 +1572,17 @@ define Device/huasifei_ws1208v2
  endef
  TARGET_DEVICES += huasifei_ws1208v2
  
@@ -256,18 +217,18 @@ index 962d7ef440..8790a2fa50 100644
    $(Device/dsa-migration)
    $(Device/uimage-lzma-loader)
 diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-index bd1d394892..0f6b7fd526 100644
+index 9e4f139a4c..9d6ada3ecb 100644
 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
 +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-@@ -60,6 +60,7 @@ ramips_setup_interfaces()
- 		;;
- 	asiarf,ap7621-001|\
+@@ -76,6 +76,7 @@ ramips_setup_interfaces()
+ 	dna,valokuitu-plus-ex400|\
+ 	genexis,pulse-ex400|\
  	humax,e10|\
 +	indio,um-305ax|\
- 	wavlink,ws-wn572hp3-4g|\
- 	winstars,ws-wn583a6)
- 		ucidef_set_interfaces_lan_wan "lan" "wan"
-@@ -148,6 +149,11 @@ ramips_setup_interfaces()
+ 	keenetic,kn-3510|\
+ 	meig,slt866|\
+ 	openfi,5pro|\
+@@ -182,6 +183,11 @@ ramips_setup_interfaces()
  	*)
  		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
  		;;
@@ -280,10 +241,10 @@ index bd1d394892..0f6b7fd526 100644
  }
  
 diff --git a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-index 3467e783f0..d5bd50fdf7 100644
+index 294929e723..015acdd3c2 100644
 --- a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
 +++ b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-@@ -60,6 +60,12 @@ case "$board" in
+@@ -91,6 +91,12 @@ case "$board" in
  			macaddr_setbit_la "$base_mac" > /sys${DEVPATH}/macaddress
  		fi
  		;;
@@ -293,9 +254,9 @@ index 3467e783f0..d5bd50fdf7 100644
 +		[ "$PHYNBR" = "1" ] && \
 +			macaddr_add "$(mtd_get_mac_binary factory 0x4)" 3 > /sys${DEVPATH}/macaddress
 +		;;
- 	glinet,gl-mt1300)
+ 	glinet,gl-mt1300|\
+ 	z-router,zr-2660)
  		[ "$PHYNBR" = "1" ] && \
- 			macaddr_add "$(mtd_get_mac_binary factory 0x4)" 1 > /sys${DEVPATH}/macaddress
 -- 
 2.47.3