diff --git a/package/firmware/ath11k-firmware/Makefile b/package/firmware/ath11k-firmware/Makefile
index 7c0653809..fc7968a95 100644
--- a/package/firmware/ath11k-firmware/Makefile
+++ b/package/firmware/ath11k-firmware/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 OpenWrt.org
+# Copyright (C) 2022 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,18 +8,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ath11k-firmware
-PKG_SOURCE_DATE:=2022-11-25
-PKG_SOURCE_VERSION:=9f285fbc1f7040d0ca6480926d1922b479e2d839
-PKG_MIRROR_HASH:=4a2d09661d8ae932f93b1cdf9889197f4051bc0dfe9b757fddc6f4af566f0bb3
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_SOURCE_DATE:=2023-03-31
+PKG_SOURCE_VERSION:=a039049a9349722fa5c74185452ab04644a0d351
+PKG_MIRROR_HASH:=ed401e3f6e91d70565b3396139193f7e815f410db93700697205ac8ed1b828c5
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/kvalo/ath11k-firmware.git
+PKG_SOURCE_URL:=https://github.com/quic/upstream-wifi-fw.git
+
+PKG_LICENSE_FILES:=LICENSE.qca_firmware
 
 PKG_MAINTAINER:=Robert Marko <robimarko@gmail.com>
 
 include $(INCLUDE_DIR)/package.mk
 
+RSTRIP:=:
+STRIP:=:
+
 define Package/ath11k-firmware-default
   SECTION:=firmware
   CATEGORY:=Firmware
@@ -27,54 +32,46 @@ define Package/ath11k-firmware-default
   DEPENDS:=
 endef
 
-define Package/ath11k-firmware-ipq6018
-$(Package/ath11k-firmware-default)
-  TITLE:=ath11k firmware for IPQ6018 devices
-endef
-
 define Package/ath11k-firmware-ipq8074
 $(Package/ath11k-firmware-default)
-  TITLE:=ath11k firmware for IPQ8074 devices
+  TITLE:=IPQ8074 ath11k firmware
 endef
 
 define Package/ath11k-firmware-qcn9074
 $(Package/ath11k-firmware-default)
-  TITLE:=ath11k firmware for QCN9074 devices
+  TITLE:=QCN9074 ath11k firmware
 endef
 
 define Build/Compile
 
 endef
 
-define Package/ath11k-firmware-ipq6018/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ6018/hw1.0
-	$(INSTALL_DIR) $(1)/lib/firmware/IPQ6018
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/IPQ6018/hw1.0/board-2.bin \
-		$(1)/lib/firmware/ath11k/IPQ6018/hw1.0/
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/IPQ6018/hw1.0/2.5.0.1/WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1/* \
-		$(1)/lib/firmware/IPQ6018/
+QCN9074_BOARD_REV:=8e140c65f36137714b6d8934e09dcd73cb05c2f6
+QCN9074_BOARD_FILE:=board-2.bin.$(QCN9074_BOARD_REV)
+
+define Download/qcn9074-board
+  URL:=https://github.com/kvalo/ath11k-firmware/raw/master/QCN9074/hw1.0/
+  URL_FILE:=board-2.bin
+  FILE:=$(QCN9074_BOARD_FILE)
+  HASH:=dbf0ca14aa1229eccd48f26f1026901b9718b143bd30b51b8ea67c84ba6207f1
 endef
+$(eval $(call Download,qcn9074-board))
 
 define Package/ath11k-firmware-ipq8074/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ8074/hw2.0
 	$(INSTALL_DIR) $(1)/lib/firmware/IPQ8074
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/IPQ8074/hw2.0/board-2.bin \
-		$(1)/lib/firmware/ath11k/IPQ8074/hw2.0/
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/IPQ8074/hw2.0/2.5.0.1/WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1/* \
+		$(PKG_BUILD_DIR)/ath11k-firmware/IPQ8074/hw2.0/testing/2.9.0.1/WLAN.HK.2.9.0.1-01385-QCAHKSWPL_SILICONZ-1/* \
 		$(1)/lib/firmware/IPQ8074/
 endef
 
 define Package/ath11k-firmware-qcn9074/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCN9074/hw1.0/2.5.0.1/WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1/* \
+		$(PKG_BUILD_DIR)/ath11k-firmware/QCN9074/hw1.0/testing/2.9.0.1/WLAN.HK.2.9.0.1-01385-QCAHKSWPL_SILICONZ-1/* \
 		$(1)/lib/firmware/ath11k/QCN9074/hw1.0/
+	$(INSTALL_BIN) \
+		$(DL_DIR)/$(QCN9074_BOARD_FILE) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/board-2.bin
 endef
 
-$(eval $(call BuildPackage,ath11k-firmware-ipq6018))
 $(eval $(call BuildPackage,ath11k-firmware-ipq8074))
 $(eval $(call BuildPackage,ath11k-firmware-qcn9074))
diff --git a/package/firmware/ath11k-wifi/Makefile b/package/firmware/ath11k-wifi/Makefile
deleted file mode 100644
index 2c33df970..000000000
--- a/package/firmware/ath11k-wifi/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/version.mk
-
-PKG_NAME:=ath11k-wifi
-PKG_RELEASE:=1
-PKG_FLAGS:=nonshared
-
-include $(INCLUDE_DIR)/package.mk
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Compile
-endef
-
-# Use ath10k-bdencoder from https://github.com/qca/qca-swiss-army-knife.git
-# to generate the board-* files here.
-#
-# This is intended to be used on an interim basis until device-specific
-# board data for new devices is available through the upstream compilation
-#
-# Please send a mail with your device-specific board files upstream.
-# You can find instructions and examples on the linux-wireless wiki:
-# <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
-
-ALLWIFIBOARDS:= \
-  edgecore-eap102 \
-	gl-ax1800 \
-	gl-axt1800 \
-	qihoo_v6
-
-ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ath11k-wifi-$(BOARD))
-
-define Package/ath11k-wifi-default
-  SUBMENU:=ath11k Board-Specific Overrides
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  DEPENDS:=@TARGET_ipq60xx
-  TITLE:=Custom Board
-endef
-
-define ath11k-wifi-install-one-to
-  $(INSTALL_DIR)  $(2)/lib/firmware/ath11k/$(3)/
-  $(INSTALL_DATA) $(1) $(2)/lib/firmware/ath11k/$(3)/board-2.bin
-endef
-
-define ath11k-wifi-install-one
-  $(if $(filter $(suffix $(1)),.IPQ6018 .ipq6018),\
-    $(call ath11k-wifi-install-one-to,$(1),$(2),IPQ6018/hw1.0),\
-    $(error Unrecognized board-file suffix '$(suffix $(1))' for '$(1)')\
-  )
-
-endef
-# Blank line required at end of above define due to foreach context
-
-define generate-ath11k-wifi-package
-  define Package/ath11k-wifi-$(1)
-    $(call Package/ath11k-wifi-default)
-    TITLE:=board-2.bin Overrides for $(2)
-    CONFLICTS:=$(PREV_BOARD)
-  endef
-
-  define Package/ath11k-wifi-$(1)/description
-The $(2) requires board-specific, reference ("cal") data
-that is not yet present in the upstream wireless firmware distribution.
-
-This package supplies board-2.bin file(s) that, in the interim,
-overwrite those supplied by the ath10k-firmware-* packages.
-
-This is package is only necessary for the $(2).
-
-Do not install it for any other device!
-  endef
-
-  define Package/ath11k-wifi-$(1)/install-overlay
-    $$$$(foreach IPQ_WIFI_BOARD_FILE,$$$$(wildcard board-$(1).*),\
-      $$$$(call ath11k-wifi-install-one,$$$$(IPQ_WIFI_BOARD_FILE),$$(1)))
-  endef
-
-  PREV_BOARD+=ath11k-wifi-$(1)
-endef
-
-# Add board name to ALLWIFIBOARDS
-# Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
-# Add $(eval $(call generate-ath11k-wifi-package,<devicename>,<display name>))
-
-$(eval $(call generate-ath11k-wifi-package,edgecore-eap102,Edgecore EAP102))
-$(eval $(call generate-ath11k-wifi-package,gl-ax1800,Gl.iNET AX1800))
-$(eval $(call generate-ath11k-wifi-package,gl-axt1800,Gl.iNET AXT1800))
-$(eval $(call generate-ath11k-wifi-package,qihoo_v6,QIHOO 360V6))
-
-
-$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
diff --git a/package/firmware/ath11k-wifi/board-2.bin.IPQ6018 b/package/firmware/ath11k-wifi/board-2.bin.IPQ6018
deleted file mode 100644
index 8c384dc89..000000000
Binary files a/package/firmware/ath11k-wifi/board-2.bin.IPQ6018 and /dev/null differ
diff --git a/package/firmware/ath11k-wifi/board-edgecore-eap102.bin.IPQ8074 b/package/firmware/ath11k-wifi/board-edgecore-eap102.bin.IPQ8074
deleted file mode 100644
index 211b99535..000000000
Binary files a/package/firmware/ath11k-wifi/board-edgecore-eap102.bin.IPQ8074 and /dev/null differ
diff --git a/package/firmware/ath11k-wifi/board-gl-ax1800.bin.IPQ6018 b/package/firmware/ath11k-wifi/board-gl-ax1800.bin.IPQ6018
deleted file mode 100644
index 9ee8d0a75..000000000
Binary files a/package/firmware/ath11k-wifi/board-gl-ax1800.bin.IPQ6018 and /dev/null differ
diff --git a/package/firmware/ath11k-wifi/board-gl-axt1800.bin.IPQ6018 b/package/firmware/ath11k-wifi/board-gl-axt1800.bin.IPQ6018
deleted file mode 100644
index 38df1592a..000000000
Binary files a/package/firmware/ath11k-wifi/board-gl-axt1800.bin.IPQ6018 and /dev/null differ
diff --git a/package/firmware/ath11k-wifi/board-qihoo_360v6.bin.IPQ6018 b/package/firmware/ath11k-wifi/board-qihoo_360v6.bin.IPQ6018
deleted file mode 100644
index cf2672889..000000000
Binary files a/package/firmware/ath11k-wifi/board-qihoo_360v6.bin.IPQ6018 and /dev/null differ
diff --git a/package/firmware/ath11k-wifi/qdss_trace_config.bin b/package/firmware/ath11k-wifi/qdss_trace_config.bin
deleted file mode 100644
index c212560df..000000000
--- a/package/firmware/ath11k-wifi/qdss_trace_config.bin
+++ /dev/null
@@ -1,99 +0,0 @@
-//This comment and parser will ignore
-//Tracer scenario(or commands) always
-//starts with start keyword
-//Below commands to enable Event traces on UMAC,MAC0,MAC1
-//seq_start;
-//seq_type:mem_req;
-//memory size always given in KB. beow example reserves 3 buffers segments of 16 KB.
-//sink:etr_ddr,0x1,0x1000;
-//seq_end;
-//Below commands to enable Event traces on UMAC,MAC0,MAC1
-seq_start;
-seq_type:mac_event_trace;
-sink:etr_ddr;
-subsys_cfg_start:mac0;
-hwsch:0x1, 0x000FFFF1,0x1036052C,0x0,0x0;
-rxdma:0x2, 0x3400,0x8000,0x0,0x0;
-crypto:0x3, 0xF79B3770,0x0,0x0,0x0;
-txpcu:0x4, 0xD687F4E7,0x20000092,0x0,0x0;
-txole:0x5, 0x640F0622,0x2,0x0,0x0;
-pdg:0x6, 0x3C800706,0x0,0x0,0x0;
-subsys_cfg_end:mac0;
-subsys_cfg_start:mac1;
-hwsch:0x7, 0x000FFFF1,0x1036052C,0x0,0x0;
-rxdma:0x8, 0x3400,0x8000,0x0,0x0;
-crypto:0x9, 0xF79B3770,0x0,0x0,0x0;
-txpcu:0xA, 0xD687F4E7,0x20000092,0x0,0x0;
-txole:0xB, 0x640F0622,0x2,0x0,0x0;
-pdg:0xC, 0x3C800706,0x0,0x0,0x0;
-subsys_cfg_end:mac1;
-swap:0xFFFFFFFF;
-trigger_start:trc;
-wfi:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-ts0:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-ts1:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-ts2:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-ts3:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-ts4:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-trigger_end:trc;
-memw:0xFFFFFFFF,0xFFFFFFFF;
-seq_end;
-// Below commands to enable obo trace on the mac0
-//seq_start;
-//seq_type:mac_obo_trace;
-//sink:etb_wcss;
-//subsys_cfg_start:mac0;
-//hwsch:0x1,0xABCDABCD;
-//subsys_cfg_end:mac0;
-//swap:0xABCDABCD;
-//trigger_start:trc;
-//wfi:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-//ts0:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-//ts1:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-//ts2:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-//ts3:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-//ts4:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
-//trigger_end:trc;
-//memw:0xFFFFFFFF,0xFFFFFFFF;
-//seq_end;
-// Below commands to enable TLV trace on the mac0
-//seq_start;
-//seq_type:mac_tlv_trace;
-//sink:etb_wcss;
-//subsys_cfg_start:mac0;
-//tlv_port:PDG_TXDMA_TLV;
-//subsys_cfg_end:mac0;
-//seq_end;
-// Below commands to enable q6 etm
-//seq_start;
-//seq_type:q6_etm_trace;
-//sink:etr_ddr;
-//seq_end;
-// Below commands to enable umac noc traces
-//seq_start;
-//seq_type:umac_noc_trace;
-//sink:etb_wcss;
-//ctrl:0x12;
-//port_sel:0x4;
-//lut:0xA;
-//routeid_base:0x01000000;
-//routeid_mask:0x01c00000;
-//addr_lo:0x0;
-//addr_hi:0x0;
-//win_size:0x25;
-//req_opcode:0x3;
-//res_status:0x3;
-//fltr_len:0xF;
-//async_period:0xC;
-//seq_end;
-// Below commands to enable umac noc traces
-//seq_start;
-//seq_type:phy_tlv_trace;
-//sink:etr_ddr;
-//seq_end;
-//seq_start;
-//seq_type:phy_event_trace;
-//sink:etr_ddr;
-//phya:0x1,0x1;
-//phyb:0x1,0x1;
-//seq_end;
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 637c23977..3729ee65f 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -2,15 +2,18 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=ipq-wifi
-PKG_RELEASE:=1
+PKG_RELEASE:=2
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware/qca-wireless.git
+PKG_SOURCE_DATE:=2023-06-03
+PKG_SOURCE_VERSION:=cd9c30ca47b8e5388b770c523a7f6b8b969e2f92
+PKG_MIRROR_HASH:=45e623fcc512b514ade0f22e217275536aa8de4afba7dfdb11696482b8fa71a2
+
 PKG_FLAGS:=nonshared
 
 include $(INCLUDE_DIR)/package.mk
 
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
 define Build/Compile
 endef
 
@@ -25,45 +28,23 @@ endef
 # <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
 
 ALLWIFIBOARDS:= \
-	8dev_habanero-dvk \
-	aruba_ap-303 \
-	asus_rt-acrh17 \
-	avm_fritzrepeater-1200 \
-	buffalo_wtr-m2133hp \
-	cellc_rtl30vw \
-	century_wr142ac \
-	devolo_magic-2-wifi-next \
-	dlink_dap2610 \
-	edgecore_ecw5410 \
-	edgecore_oap100 \
-	engenius_eap2200 \
-	engenius_emd1 \
-	engenius_emr3500 \
-	ezviz_cs-w3-wd1200g-eup \
-	glinet_gl-ap1300 \
-	glinet_gl-s1300 \
-	hiwifi_c526a \
-	linksys_ea8300 \
-	linksys_mr8300-v0 \
-	luma_wrtq-329acn \
-	mikrotik_hap-ac2 \
-	mikrotik_sxtsq-5-ac \
-	mobipromo_cm520-79f \
-	nec_wg2600hp3 \
-	netgear_sxr80 \
-	netgear_wac510 \
-	plasmacloud_pa1200 \
-	plasmacloud_pa2200 \
+	buffalo_wxr-5950ax12 \
+	compex_wpq873 \
+	dynalink_dl-wrx36 \
+	edgecore_eap102 \
+	edimax_cax1800 \
+	netgear_rax120v2 \
+	netgear_wax218 \
 	p2w_r619ac \
+	prpl_haze \
 	qnap_301w \
-	qxwlan_e2600ac \
 	redmi_ax6 \
+	wallys_dr40x9 \
 	xiaomi_ax3600 \
 	xiaomi_ax9000 \
-	zte_mf263 \
-	zte_mf269 \
-	zyxel_nbg7815 \
-	tplink_xtr10890
+	zte_mf289f \
+	zte_mf287plus \
+	zyxel_nbg7815
 
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
 
@@ -90,14 +71,18 @@ define ipq-wifi-install-one
     $(call ipq-wifi-install-one-to,$(1),$(2),QCA4019/hw1.0),\
   $(if $(filter $(suffix $(1)),.QCA9888 .qca9888),\
     $(call ipq-wifi-install-one-to,$(1),$(2),QCA9888/hw2.0),\
-  $(if $(filter $(suffix $(1)),.QCA9984 .qca9984),\
-    $(call ipq-wifi-install-one-to,$(1),$(2),QCA9984/hw1.0),\
   $(if $(filter $(suffix $(1)),.QCA9889 .qca9889),\
     $(call ipq-wifi-install-one-to,$(1),$(2),QCA9887/hw1.0),\
+  $(if $(filter $(suffix $(1)),.QCA9984 .qca9984),\
+    $(call ipq-wifi-install-one-to,$(1),$(2),QCA9984/hw1.0),\
+  $(if $(filter $(suffix $(1)),.QCA99X0 .qca99x0),\
+    $(call ipq-wifi-install-one-to,$(1),$(2),QCA99X0/hw2.0),\
   $(if $(filter $(suffix $(1)),.IPQ8074 .ipq8074),\
     $(call ipq-wifi-install-ath11-one-to,$(1),$(2),IPQ8074/hw2.0),\
+  $(if $(filter $(suffix $(1)),.QCN9074 .qcn9074),\
+    $(call ipq-wifi-install-ath11-one-to,$(1),$(2),QCN9074/hw1.0),\
     $(error Unrecognized board-file suffix '$(suffix $(1))' for '$(1)')\
-  )))))
+  )))))))
 
 endef
 # Blank line required at end of above define due to foreach context
@@ -122,7 +107,7 @@ Do not install it for any other device!
   endef
 
   define Package/ipq-wifi-$(1)/install-overlay
-    $$$$(foreach IPQ_WIFI_BOARD_FILE,$$$$(wildcard board-$(1).*),\
+    $$$$(foreach IPQ_WIFI_BOARD_FILE,$$$$(wildcard $(PKG_BUILD_DIR)/board-$(1).*),\
       $$$$(call ipq-wifi-install-one,$$$$(IPQ_WIFI_BOARD_FILE),$$(1)))
   endef
 
@@ -130,48 +115,25 @@ Do not install it for any other device!
 endef
 
 # Add board name to ALLWIFIBOARDS
-# Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
+# Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9889|qca9984|qca99x0|ipq8074>
 # Add $(eval $(call generate-ipq-wifi-package,<devicename>,<display name>))
 
-$(eval $(call generate-ipq-wifi-package,8dev_habanero-dvk,8devices Habanero DVK))
-$(eval $(call generate-ipq-wifi-package,aruba_ap-303,Aruba AP-303))
-$(eval $(call generate-ipq-wifi-package,asus_rt-acrh17,ASUS RT-ACRH17/RT-AC82U/RT-AC42U))
-$(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater 1200))
-$(eval $(call generate-ipq-wifi-package,buffalo_wtr-m2133hp,Buffalo WTR-M2133HP))
-$(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
-$(eval $(call generate-ipq-wifi-package,century_wr142ac,Century WR142AC))
-$(eval $(call generate-ipq-wifi-package,devolo_magic-2-wifi-next,devolo Magic 2 WiFi next))
-$(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610))
-$(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410))
-$(eval $(call generate-ipq-wifi-package,edgecore_oap100,Edgecore OAP100))
-$(eval $(call generate-ipq-wifi-package,engenius_eap2200,EnGenius EAP2200))
-$(eval $(call generate-ipq-wifi-package,engenius_emd1,EnGenius EMD1))
-$(eval $(call generate-ipq-wifi-package,engenius_emr3500,EnGenius EMR3500))
-$(eval $(call generate-ipq-wifi-package,ezviz_cs-w3-wd1200g-eup,EZVIZ CS-W3-WD1200G EUP))
-$(eval $(call generate-ipq-wifi-package,glinet_gl-a1300,GL.iNet GL-A1300))
-$(eval $(call generate-ipq-wifi-package,glinet_gl-ap1300,GL.iNet GL-AP1300))
-$(eval $(call generate-ipq-wifi-package,glinet_gl-s1300,GL.iNet GL-S1300))
-$(eval $(call generate-ipq-wifi-package,hiwifi_c526a,HiWiFi C526A))
-$(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300))
-$(eval $(call generate-ipq-wifi-package,linksys_mr8300-v0,Linksys MR8300))
-$(eval $(call generate-ipq-wifi-package,luma_wrtq-329acn,Luma WRTQ-329ACN))
-$(eval $(call generate-ipq-wifi-package,mikrotik_hap-ac2,Mikrotik hAP ac2))
-$(eval $(call generate-ipq-wifi-package,mikrotik_sxtsq-5-ac,MikroTik SXTsq 5 ac))
-$(eval $(call generate-ipq-wifi-package,mobipromo_cm520-79f,MobiPromo CM520-79F))
-$(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
-$(eval $(call generate-ipq-wifi-package,netgear_sxr80,Netgear SXR80))
-$(eval $(call generate-ipq-wifi-package,netgear_wac510,Netgear WAC510))
-$(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
-$(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
+$(eval $(call generate-ipq-wifi-package,buffalo_wxr-5950ax12,Buffalo WXR-5950AX12))
+$(eval $(call generate-ipq-wifi-package,compex_wpq873,Compex WPQ-873))
+$(eval $(call generate-ipq-wifi-package,dynalink_dl-wrx36,Dynalink DL-WRX36))
+$(eval $(call generate-ipq-wifi-package,edgecore_eap102,Edgecore EAP102))
+$(eval $(call generate-ipq-wifi-package,edimax_cax1800,Edimax CAX1800))
+$(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2))
+$(eval $(call generate-ipq-wifi-package,netgear_wax218,Netgear WAX218))
 $(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC))
 $(eval $(call generate-ipq-wifi-package,qnap_301w,QNAP 301w))
-$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
+$(eval $(call generate-ipq-wifi-package,prpl_haze,prpl Haze))
 $(eval $(call generate-ipq-wifi-package,redmi_ax6,Redmi AX6))
+$(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9))
 $(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600))
 $(eval $(call generate-ipq-wifi-package,xiaomi_ax9000,Xiaomi AX9000))
-$(eval $(call generate-ipq-wifi-package,zte_mf263,ZTE MF263))
-$(eval $(call generate-ipq-wifi-package,zte_mf269,ZTE MF269))
+$(eval $(call generate-ipq-wifi-package,zte_mf289f,ZTE MF289F))
+$(eval $(call generate-ipq-wifi-package,zte_mf287plus,ZTE MF287Plus))
 $(eval $(call generate-ipq-wifi-package,zyxel_nbg7815,Zyxel NBG7815))
-$(eval $(call generate-ipq-wifi-package,tplink_xtr10890,TPLINK XTR10890))
 
 $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
diff --git a/package/firmware/ipq-wifi/board-8dev_habanero-dvk.qca4019 b/package/firmware/ipq-wifi/board-8dev_habanero-dvk.qca4019
deleted file mode 100644
index 9048239cf..000000000
Binary files a/package/firmware/ipq-wifi/board-8dev_habanero-dvk.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-aruba_ap-303.qca4019 b/package/firmware/ipq-wifi/board-aruba_ap-303.qca4019
deleted file mode 100644
index 4848115cf..000000000
Binary files a/package/firmware/ipq-wifi/board-aruba_ap-303.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-asus_rt-acrh17.qca4019 b/package/firmware/ipq-wifi/board-asus_rt-acrh17.qca4019
deleted file mode 100644
index d45d16af7..000000000
Binary files a/package/firmware/ipq-wifi/board-asus_rt-acrh17.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-avm_fritzrepeater-1200.qca4019 b/package/firmware/ipq-wifi/board-avm_fritzrepeater-1200.qca4019
deleted file mode 100644
index d78a49d4d..000000000
Binary files a/package/firmware/ipq-wifi/board-avm_fritzrepeater-1200.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-buffalo_wtr-m2133hp.qca4019 b/package/firmware/ipq-wifi/board-buffalo_wtr-m2133hp.qca4019
deleted file mode 100644
index 8305ba016..000000000
Binary files a/package/firmware/ipq-wifi/board-buffalo_wtr-m2133hp.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-buffalo_wtr-m2133hp.qca9984 b/package/firmware/ipq-wifi/board-buffalo_wtr-m2133hp.qca9984
deleted file mode 100644
index 656cb99cb..000000000
Binary files a/package/firmware/ipq-wifi/board-buffalo_wtr-m2133hp.qca9984 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-cellc_rtl30vw.qca4019 b/package/firmware/ipq-wifi/board-cellc_rtl30vw.qca4019
deleted file mode 100644
index 2fff2bf5f..000000000
Binary files a/package/firmware/ipq-wifi/board-cellc_rtl30vw.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-century_wr142ac.qca4019 b/package/firmware/ipq-wifi/board-century_wr142ac.qca4019
deleted file mode 100644
index d4efac281..000000000
Binary files a/package/firmware/ipq-wifi/board-century_wr142ac.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-devolo_magic-2-wifi-next.qca4019 b/package/firmware/ipq-wifi/board-devolo_magic-2-wifi-next.qca4019
deleted file mode 100644
index cf86721fe..000000000
Binary files a/package/firmware/ipq-wifi/board-devolo_magic-2-wifi-next.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-dlink_dap2610.qca4019 b/package/firmware/ipq-wifi/board-dlink_dap2610.qca4019
deleted file mode 100644
index 08ed731a4..000000000
Binary files a/package/firmware/ipq-wifi/board-dlink_dap2610.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-edgecore_ecw5410.qca9984 b/package/firmware/ipq-wifi/board-edgecore_ecw5410.qca9984
deleted file mode 100644
index 2c1992001..000000000
Binary files a/package/firmware/ipq-wifi/board-edgecore_ecw5410.qca9984 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-edgecore_oap100.qca4019 b/package/firmware/ipq-wifi/board-edgecore_oap100.qca4019
deleted file mode 100644
index 9f1b5c93b..000000000
Binary files a/package/firmware/ipq-wifi/board-edgecore_oap100.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-engenius_eap2200.qca4019 b/package/firmware/ipq-wifi/board-engenius_eap2200.qca4019
deleted file mode 100644
index 337d896d1..000000000
Binary files a/package/firmware/ipq-wifi/board-engenius_eap2200.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-engenius_eap2200.qca9888 b/package/firmware/ipq-wifi/board-engenius_eap2200.qca9888
deleted file mode 100644
index 2e938f478..000000000
Binary files a/package/firmware/ipq-wifi/board-engenius_eap2200.qca9888 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-engenius_emd1.qca4019 b/package/firmware/ipq-wifi/board-engenius_emd1.qca4019
deleted file mode 100644
index 3a2d77597..000000000
Binary files a/package/firmware/ipq-wifi/board-engenius_emd1.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-engenius_emr3500.qca4019 b/package/firmware/ipq-wifi/board-engenius_emr3500.qca4019
deleted file mode 100644
index 9f7ecfb70..000000000
Binary files a/package/firmware/ipq-wifi/board-engenius_emr3500.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-ezviz_cs-w3-wd1200g-eup.qca4019 b/package/firmware/ipq-wifi/board-ezviz_cs-w3-wd1200g-eup.qca4019
deleted file mode 100644
index 987e34c64..000000000
Binary files a/package/firmware/ipq-wifi/board-ezviz_cs-w3-wd1200g-eup.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-glinet_gl-a1300.qca4019 b/package/firmware/ipq-wifi/board-glinet_gl-a1300.qca4019
deleted file mode 100644
index d8695c983..000000000
Binary files a/package/firmware/ipq-wifi/board-glinet_gl-a1300.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-glinet_gl-ap1300.qca4019 b/package/firmware/ipq-wifi/board-glinet_gl-ap1300.qca4019
deleted file mode 100644
index 481dd81b5..000000000
Binary files a/package/firmware/ipq-wifi/board-glinet_gl-ap1300.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-glinet_gl-s1300.qca4019 b/package/firmware/ipq-wifi/board-glinet_gl-s1300.qca4019
deleted file mode 100644
index b84e62f82..000000000
Binary files a/package/firmware/ipq-wifi/board-glinet_gl-s1300.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-hiwifi_c526a.qca4019 b/package/firmware/ipq-wifi/board-hiwifi_c526a.qca4019
deleted file mode 100644
index ce91af5b1..000000000
Binary files a/package/firmware/ipq-wifi/board-hiwifi_c526a.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-linksys_ea8300.qca4019 b/package/firmware/ipq-wifi/board-linksys_ea8300.qca4019
deleted file mode 100644
index 0a1f6ebd4..000000000
Binary files a/package/firmware/ipq-wifi/board-linksys_ea8300.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-linksys_ea8300.qca9888 b/package/firmware/ipq-wifi/board-linksys_ea8300.qca9888
deleted file mode 100644
index e3c203992..000000000
Binary files a/package/firmware/ipq-wifi/board-linksys_ea8300.qca9888 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-linksys_mr8300-v0.qca4019 b/package/firmware/ipq-wifi/board-linksys_mr8300-v0.qca4019
deleted file mode 100644
index 689d9c481..000000000
Binary files a/package/firmware/ipq-wifi/board-linksys_mr8300-v0.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-linksys_mr8300-v0.qca9888 b/package/firmware/ipq-wifi/board-linksys_mr8300-v0.qca9888
deleted file mode 100644
index 90b6bac08..000000000
Binary files a/package/firmware/ipq-wifi/board-linksys_mr8300-v0.qca9888 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-luma_wrtq-329acn.qca4019 b/package/firmware/ipq-wifi/board-luma_wrtq-329acn.qca4019
deleted file mode 100644
index 4e5260271..000000000
Binary files a/package/firmware/ipq-wifi/board-luma_wrtq-329acn.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-mikrotik_hap-ac2.qca4019 b/package/firmware/ipq-wifi/board-mikrotik_hap-ac2.qca4019
deleted file mode 100644
index 73372c183..000000000
Binary files a/package/firmware/ipq-wifi/board-mikrotik_hap-ac2.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-mikrotik_sxtsq-5-ac.qca4019 b/package/firmware/ipq-wifi/board-mikrotik_sxtsq-5-ac.qca4019
deleted file mode 100644
index 97f982637..000000000
Binary files a/package/firmware/ipq-wifi/board-mikrotik_sxtsq-5-ac.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-mobipromo_cm520-79f.qca4019 b/package/firmware/ipq-wifi/board-mobipromo_cm520-79f.qca4019
deleted file mode 100644
index d717af12f..000000000
Binary files a/package/firmware/ipq-wifi/board-mobipromo_cm520-79f.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-nec_wg2600hp3.qca9984 b/package/firmware/ipq-wifi/board-nec_wg2600hp3.qca9984
deleted file mode 100644
index f95ccd251..000000000
Binary files a/package/firmware/ipq-wifi/board-nec_wg2600hp3.qca9984 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-netgear_sxr80.ipq8074 b/package/firmware/ipq-wifi/board-netgear_sxr80.ipq8074
deleted file mode 100644
index 446876c00..000000000
Binary files a/package/firmware/ipq-wifi/board-netgear_sxr80.ipq8074 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019 b/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019
deleted file mode 100644
index a1b1166f6..000000000
Binary files a/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-plasmacloud_pa1200.qca4019 b/package/firmware/ipq-wifi/board-plasmacloud_pa1200.qca4019
deleted file mode 100644
index 99d6df8c8..000000000
Binary files a/package/firmware/ipq-wifi/board-plasmacloud_pa1200.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-plasmacloud_pa2200.qca4019 b/package/firmware/ipq-wifi/board-plasmacloud_pa2200.qca4019
deleted file mode 100644
index d1db0f5f4..000000000
Binary files a/package/firmware/ipq-wifi/board-plasmacloud_pa2200.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-plasmacloud_pa2200.qca9888 b/package/firmware/ipq-wifi/board-plasmacloud_pa2200.qca9888
deleted file mode 100644
index 6c3f083eb..000000000
Binary files a/package/firmware/ipq-wifi/board-plasmacloud_pa2200.qca9888 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-qnap_301w.ipq8074 b/package/firmware/ipq-wifi/board-qnap_301w.ipq8074
deleted file mode 100644
index 6b8f8b9ce..000000000
Binary files a/package/firmware/ipq-wifi/board-qnap_301w.ipq8074 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-qxwlan_e2600ac.qca4019 b/package/firmware/ipq-wifi/board-qxwlan_e2600ac.qca4019
deleted file mode 100644
index 435b465d8..000000000
Binary files a/package/firmware/ipq-wifi/board-qxwlan_e2600ac.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-redmi_ax6.ipq8074 b/package/firmware/ipq-wifi/board-redmi_ax6.ipq8074
deleted file mode 100644
index 98ed9c6f6..000000000
Binary files a/package/firmware/ipq-wifi/board-redmi_ax6.ipq8074 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-tplink_xtr10890.ipq8074 b/package/firmware/ipq-wifi/board-tplink_xtr10890.ipq8074
deleted file mode 100755
index 2815a4d66..000000000
Binary files a/package/firmware/ipq-wifi/board-tplink_xtr10890.ipq8074 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-xiaomi_ax3600.ipq8074 b/package/firmware/ipq-wifi/board-xiaomi_ax3600.ipq8074
deleted file mode 100644
index db8ef4cef..000000000
Binary files a/package/firmware/ipq-wifi/board-xiaomi_ax3600.ipq8074 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-xiaomi_ax3600.qca9889 b/package/firmware/ipq-wifi/board-xiaomi_ax3600.qca9889
deleted file mode 100644
index af4405cd5..000000000
Binary files a/package/firmware/ipq-wifi/board-xiaomi_ax3600.qca9889 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-xiaomi_ax9000.ipq8074 b/package/firmware/ipq-wifi/board-xiaomi_ax9000.ipq8074
deleted file mode 100644
index babfaa2a9..000000000
Binary files a/package/firmware/ipq-wifi/board-xiaomi_ax9000.ipq8074 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-zte_mf263.qca4019 b/package/firmware/ipq-wifi/board-zte_mf263.qca4019
deleted file mode 100755
index 8903e90b4..000000000
Binary files a/package/firmware/ipq-wifi/board-zte_mf263.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-zte_mf269.ipq8074 b/package/firmware/ipq-wifi/board-zte_mf269.ipq8074
deleted file mode 100755
index 050b1259c..000000000
Binary files a/package/firmware/ipq-wifi/board-zte_mf269.ipq8074 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-zyxel_nbg7815.ipq8074 b/package/firmware/ipq-wifi/board-zyxel_nbg7815.ipq8074
deleted file mode 100644
index 3a1c88b76..000000000
Binary files a/package/firmware/ipq-wifi/board-zyxel_nbg7815.ipq8074 and /dev/null differ