diff --git a/configs/ath79-mikrotik-ath10k.config b/configs/ath79-mikrotik-ath10k.config
index a68f51c6..b132a99f 100755
--- a/configs/ath79-mikrotik-ath10k.config
+++ b/configs/ath79-mikrotik-ath10k.config
@@ -11,7 +11,6 @@ CONFIG_TARGET_ROOTFS_INITRAMFS=y
 # DEVICE_PACKAGES are not included in the initramfs, but for these devices we need
 # extra packages pre-installed to successfully install sysupgrade.
 #
-CONFIG_PACKAGE_ath10k-board-qca988x=y
 CONFIG_PACKAGE_ath10k-firmware-qca988x-ct=y
 CONFIG_PACKAGE_kmod-ath10k-ct=y
 CONFIG_PACKAGE_nand-utils=y
diff --git a/files/usr/local/bin/node-setup b/files/usr/local/bin/node-setup
index 029e10c0..0524862f 100755
--- a/files/usr/local/bin/node-setup
+++ b/files/usr/local/bin/node-setup
@@ -76,6 +76,7 @@ local cm = uci.cursor("/etc/config.mesh")
 local auto = false
 local do_basic = true
 local config = nil
+local wifi_mon_enable = false
 for i, a in ipairs(arg)
 do
     if a == "-a" then
@@ -959,11 +960,11 @@ if nixio.fs.stat(ieee80211) then
         end
         config = config .. "\n"
 
-        if is_mesh_rf then
+        if is_mesh_rf and wifi_mon_enable then
             config = config .. "config wifi-iface\n"
-            config = config .. "	option ifname '" .. wlan .. "-1'\n"
-            config = config .. "	option device '" .. radio .. "'\n"
-            config = config .. "	option network 'wifi_mon'\n	option mode 'monitor'\n\n"
+            config = config .. "       option ifname '" .. wlan .. "-1'\n"
+            config = config .. "       option device '" .. radio .. "'\n"
+            config = config .. "       option network 'wifi_mon'\n     option mode 'monitor'\n\n"
         end
 
         ifacenum = ifacenum + 1
diff --git a/patches/742-5-and-10mhz-ath10k-ct-support.patch b/patches/742-5-and-10mhz-ath10k-ct-support.patch
index 7a33feae..95b8cda9 100644
--- a/patches/742-5-and-10mhz-ath10k-ct-support.patch
+++ b/patches/742-5-and-10mhz-ath10k-ct-support.patch
@@ -312,3 +312,32 @@ Index: openwrt/package/kernel/ath10k-ct/patches/999-0002-ath10k-5_10Mhz.patch
 + 	/* After an error we will not retry setting the coverage class. */
 + 	spin_lock_bh(&ar->data_lock);
 + 	ar->fw_coverage.coverage_class = value;
+--- /dev/null
+--- openwrt/package/kernel/ath10k-ct/patches/999-0005-ath10k-force-ibss.patch
+@@ -0,0 +1,10 @@
++--- a/ath10k-5.15/mac.c
+++++ b/ath10k-5.15/mac.c
++@@ -11533,6 +11533,7 @@
++ 		} else {
++ 			ret = ath10k_copy_comb(ar, ath10k_10x_if_comb,
++ 					       ARRAY_SIZE(ath10k_10x_if_comb));
+++			ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
++ 		}
++ 		break;
++ 	case ATH10K_FW_WMI_OP_VERSION_10_4:
+--- /dev/null
++++ openwrt/package/kernel/ath10k-ct/patches/999-0006-ath10k-no-noisy-warning.patch
+@@ -0,0 +1,13 @@
++--- a/ath10k-5.15/htt_rx.c
+++++ b/ath10k-5.15/htt_rx.c
++@@ -4173,8 +4173,8 @@
++ 	spin_lock_bh(&ar->data_lock);
++ 	peer = ath10k_peer_find_by_id(ar, peer_id);
++ 	if (!peer || !peer->sta) {
++-		ath10k_warn(ar, "Invalid peer id %d in peer stats buffer\n",
++-			    peer_id);
+++		/* ath10k_warn(ar, "Invalid peer id %d in peer stats buffer\n",
+++			    peer_id); */
++ 		goto out;
++ 	}
++ 
diff --git a/patches/744-dd-wrt-firmware.patch b/patches/744-dd-wrt-firmware.patch
index 3fa17aa3..502943e5 100644
--- a/patches/744-dd-wrt-firmware.patch
+++ b/patches/744-dd-wrt-firmware.patch
@@ -5,7 +5,7 @@
  $(eval $(call BuildPackage,ath10k-firmware-qca9887-ct))
  $(eval $(call BuildPackage,ath10k-firmware-qca9887-ct-full-htt))
 -$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
-+$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
++#$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
  $(eval $(call BuildPackage,ath10k-firmware-qca988x-ct-full-htt))
  $(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct))
  $(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct-full-htt))