diff --git a/patches/ipq40xx/0003-ipq4019-add-CIG-wf610d.patch b/patches/ipq40xx/0003-ipq4019-add-CIG-wf610d.patch
index 66b2a961d..c1cae25f4 100644
--- a/patches/ipq40xx/0003-ipq4019-add-CIG-wf610d.patch
+++ b/patches/ipq40xx/0003-ipq4019-add-CIG-wf610d.patch
@@ -1,7 +1,7 @@
-From 7244d33107173856db10bb2084146137704e7e18 Mon Sep 17 00:00:00 2001
+From abd52a80294b6752cc66432041e91ca11944366e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 4 Sep 2021 05:56:53 +0200
-Subject: [PATCH 28/43] ipq4019: add CIG wf610d
+Subject: [PATCH 01/33] ipq4019: add CIG wf610d
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -11,10 +11,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
  .../ipq40xx/base-files/etc/board.d/02_network |   1 +
  .../etc/hotplug.d/firmware/11-ath10k-caldata  |   8 +
  .../lib/preinit/05_set_iface_mac_ipq40xx.sh   |   4 +
- .../boot/dts/qcom-ipq4029-ap-cig-wf610d.dts   | 409 ++++++++++++++++++
+ .../boot/dts/qcom-ipq4029-ap-cig-wf610d.dts   | 414 ++++++++++++++++++
  target/linux/ipq40xx/image/generic.mk         |  14 +
  .../901-arm-boot-add-dts-files.patch          |   3 +-
- 9 files changed, 444 insertions(+), 2 deletions(-)
+ 9 files changed, 449 insertions(+), 2 deletions(-)
  create mode 100644 package/firmware/ipq-wifi/board-cig_wf610d.qca4019
  create mode 100755 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts
 
@@ -133,7 +133,7 @@ index 1d4c78833a..d62a2e5061 100755
  	edgecore,oap100|\
  	openmesh,a42|\
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index b7ee73b12e..3948c08984 100644
+index b12c9af9a7..4a3f18579c 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 @@ -93,6 +93,10 @@ case "$FIRMWARE" in
@@ -175,10 +175,10 @@ index 0d606c75b5..4d3b1df219 100644
  		ip link set dev eth1 address $(mtd_get_mac_binary "ART" 0x0)
 diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts
 new file mode 100755
-index 0000000000..e75e35e8ef
+index 0000000000..3f24369f19
 --- /dev/null
 +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts
-@@ -0,0 +1,409 @@
+@@ -0,0 +1,414 @@
 +/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
 + *
 + * Permission to use, copy, modify, and/or distribute this software for any
@@ -395,7 +395,13 @@ index 0000000000..e75e35e8ef
 +					firmware@180000 {
 +						compatible = "denx,fit";
 +						label = "firmware";
-+						reg = <0x180000 0x1e80000>;
++						reg = <0x180000 0x1e70000>;
++					};
++
++					certificates@1ff0000 {
++						compatible = "denx,fit";
++						label = "certificates";
++						reg = <0x1ff0000 0x10000>;
 +					};
 +				};
 +			};
@@ -522,9 +528,8 @@ index 0000000000..e75e35e8ef
 +		};
 +
 +		ess-switch@c000000 {
-+			switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
 +			switch_lan_bmp = <0x3e>; /* lan port bitmap */
-+			switch_wan_bmp = <0>; /* wan port bitmap */
++			switch_wan_bmp = <1>; /* wan port bitmap */
 +			status = "okay";
 +		};
 +
@@ -589,7 +594,7 @@ index 0000000000..e75e35e8ef
 +
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index a435a127fa..31f4971c90 100644
+index 49aa202e62..bca03f58ec 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
 @@ -271,6 +271,20 @@ define Device/cilab_meshpoint-one