diff --git a/feeds/qca-wifi-7/ipq53xx/image/Makefile b/feeds/qca-wifi-7/ipq53xx/image/Makefile
index 810322cec..a42bd364f 100644
--- a/feeds/qca-wifi-7/ipq53xx/image/Makefile
+++ b/feeds/qca-wifi-7/ipq53xx/image/Makefile
@@ -12,8 +12,8 @@ define Device/Default
   ROOTFSNAME_IN_UBI := ubi_rootfs
   BLOCKSIZE := 128k
   PAGESIZE := 2048
-  IMAGES := sysupgrade.tar nand-factory.bin
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   KERNEL_NAME := Image
   KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
diff --git a/feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk b/feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk
index 51c6ae544..d7d40259a 100755
--- a/feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk
+++ b/feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk
@@ -5,8 +5,8 @@ define Device/cig_wf189
   DEVICE_DTS := ipq5332-cig-wf189
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.6
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-cig-wf189 ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
@@ -18,8 +18,8 @@ define Device/sercomm_ap72tip
   DEVICE_DTS := ipq5332-sercomm-ap72tip
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.6
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-sercomm-ap72tip ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
@@ -31,8 +31,8 @@ define Device/sercomm_ap72tip-v4
   DEVICE_DTS := ipq5332-sercomm-ap72tip-v4
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.6
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-sercomm-ap72tip-v4 ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
@@ -44,8 +44,8 @@ define Device/edgecore_eap105
   DEVICE_DTS := ipq5332-edgecore-eap105
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.6
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-edgecore-eap105 ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
@@ -57,8 +57,8 @@ define Device/emplus_wap7635
   DEVICE_DTS := ipq5332-emplus-wap7635
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.6
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-emplus-wap7635 ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
@@ -71,9 +71,9 @@ define Device/sonicfi_rap7110c_341x
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.6
   SUPPORTED_DEVICES := sonicfi,rap7110c-341x
-  IMAGES := sysupgrade.tar mmc-factory.bin
+  IMAGES := sysupgrade.bin mmc-factory.bin
   IMAGE/mmc-factory.bin := append-ubi | qsdk-ipq-factory-mmc
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap7110c-341x ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
 endef
 TARGET_DEVICES += sonicfi_rap7110c_341x
@@ -84,8 +84,8 @@ define Device/sonicfi_rap750e_h
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.3-c2
   SUPPORTED_DEVICES := sonicfi,rap750e-h
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap750e-h ath12k-firmware-ipq5332-peb -ath12k-firmware-qcn92xx
@@ -98,8 +98,8 @@ define Device/sonicfi_rap750e_s
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.3-c2
   SUPPORTED_DEVICES := sonicfi,rap750e-s
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap750e-s ath12k-firmware-ipq5332-peb -ath12k-firmware-qcn92xx
@@ -112,8 +112,8 @@ define Device/sonicfi_rap750w_311a
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.3-c2
   SUPPORTED_DEVICES := sonicfi,rap750w-311a
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap750w-311a ath12k-firmware-ipq5332-peb -ath12k-firmware-qcn92xx
@@ -125,8 +125,8 @@ define Device/cig_wf189w
   DEVICE_DTS := ipq5332-cig-wf189w
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi04.1
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-cig-wf189w ath12k-firmware-ipq5332-peb-peb
@@ -139,8 +139,8 @@ define Device/cig_wf189h
   DEVICE_DTS := ipq5332-cig-wf189h
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi04.1
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-cig-wf189h ath12k-firmware-ipq5332-peb-peb
@@ -152,10 +152,10 @@ define Device/zyxel_nwa130be
   DEVICE_DTS := ipq5332-zyxel-nwa130be
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.6
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
+  IMAGES := sysupgrade.bin nand-factory.bin nand-factory.ubi
   BLOCKSIZE := 256k
   PAGESIZE := 4096
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
   IMAGE/nand-factory.ubi := append-ubi
   DEVICE_PACKAGES := ath12k-wifi-zyxel-nwa130be ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
@@ -183,9 +183,9 @@ define Device/cig_wf672
   DEVICE_DTS := ipq5332-cig-wf672
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.6
-  IMAGES := sysupgrade.tar mmc-factory.bin
+  IMAGES := sysupgrade.bin mmc-factory.bin
   IMAGE/mmc-factory.bin := append-ubi | qsdk-ipq-factory-mmc
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   DEVICE_PACKAGES := ath12k-wifi-cig-wf672 ath12k-firmware-ipq5332 ath12k-firmware-qcn92xx
 endef
 TARGET_DEVICES += cig_wf672
diff --git a/feeds/qca-wifi-7/linux/generic/.gitkeep b/feeds/qca-wifi-7/linux/generic/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/profiles/cig_wf189.yml b/profiles/cig_wf189.yml
index 8173088ce..1e5a75113 100644
--- a/profiles/cig_wf189.yml
+++ b/profiles/cig_wf189.yml
@@ -3,7 +3,7 @@ profile: cig_wf189
 target: ipq53xx
 subtarget: generic
 description: Build image for the CIG WF189
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/cig_wf189h.yml b/profiles/cig_wf189h.yml
index b123a1578..7e922ef41 100644
--- a/profiles/cig_wf189h.yml
+++ b/profiles/cig_wf189h.yml
@@ -3,7 +3,7 @@ profile: cig_wf189h
 target: ipq53xx
 subtarget: generic
 description: Build image for the CIG WF189h
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189h-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189h-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/cig_wf189w.yml b/profiles/cig_wf189w.yml
index 58d151945..9e6c3d207 100644
--- a/profiles/cig_wf189w.yml
+++ b/profiles/cig_wf189w.yml
@@ -3,7 +3,7 @@ profile: cig_wf189w
 target: ipq53xx
 subtarget: generic
 description: Build image for the CIG WF189W
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189w-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189w-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/cig_wf672.yml b/profiles/cig_wf672.yml
index 5cbe23497..ff78ea3ae 100644
--- a/profiles/cig_wf672.yml
+++ b/profiles/cig_wf672.yml
@@ -3,7 +3,7 @@ profile: cig_wf672
 target: ipq53xx
 subtarget: generic
 description: Build image for the CIG WF672
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf672-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf672-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/edgecore_eap105.yml b/profiles/edgecore_eap105.yml
index 0e8feceea..2eec32cdc 100644
--- a/profiles/edgecore_eap105.yml
+++ b/profiles/edgecore_eap105.yml
@@ -3,7 +3,7 @@ profile: edgecore_eap105
 target: ipq53xx
 subtarget: generic
 description: Build image for the edgecore eap105
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-edgecore_eap105-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-edgecore_eap105-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/emplus_wap7635.yml b/profiles/emplus_wap7635.yml
index d59d41f6a..754ddaddc 100644
--- a/profiles/emplus_wap7635.yml
+++ b/profiles/emplus_wap7635.yml
@@ -3,7 +3,7 @@ profile: emplus_wap7635
 target: ipq53xx
 subtarget: generic
 description: Build image for the EMPLUS WAP7635
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-emplus_wap7635-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-emplus_wap7635-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/sercomm_ap72tip-v4.yml b/profiles/sercomm_ap72tip-v4.yml
index 3f36991c6..69b575afe 100644
--- a/profiles/sercomm_ap72tip-v4.yml
+++ b/profiles/sercomm_ap72tip-v4.yml
@@ -3,7 +3,7 @@ profile: sercomm_ap72tip-v4
 target: ipq53xx
 subtarget: generic
 description: Build image for the Sercomm AP72TIP-v4
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sercomm_ap72tip-v4-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sercomm_ap72tip-v4-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/sercomm_ap72tip.yml b/profiles/sercomm_ap72tip.yml
index 95900925c..989a6dc42 100644
--- a/profiles/sercomm_ap72tip.yml
+++ b/profiles/sercomm_ap72tip.yml
@@ -3,7 +3,7 @@ profile: sercomm_ap72tip
 target: ipq53xx
 subtarget: generic
 description: Build image for the Sercomm AP72TIP
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sercomm_ap72tip-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sercomm_ap72tip-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/sonicfi_rap7110c-341x.yml b/profiles/sonicfi_rap7110c-341x.yml
index 0fe1afdfd..38c742d7f 100755
--- a/profiles/sonicfi_rap7110c-341x.yml
+++ b/profiles/sonicfi_rap7110c-341x.yml
@@ -3,7 +3,7 @@ profile: sonicfi_rap7110c_341x
 target: ipq53xx
 subtarget: generic
 description: Build image for the SONICFI RAP7110C-341X
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap7110c_341x-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap7110c_341x-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/sonicfi_rap750e-h.yml b/profiles/sonicfi_rap750e-h.yml
index ea038322e..1fa250d8b 100755
--- a/profiles/sonicfi_rap750e-h.yml
+++ b/profiles/sonicfi_rap750e-h.yml
@@ -3,7 +3,7 @@ profile: sonicfi_rap750e_h
 target: ipq53xx
 subtarget: generic
 description: Build image for the SONICFI RAP750E-H
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap750e_h-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap750e_h-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/sonicfi_rap750e-s.yml b/profiles/sonicfi_rap750e-s.yml
index 9ce58fd76..8bafa50ae 100755
--- a/profiles/sonicfi_rap750e-s.yml
+++ b/profiles/sonicfi_rap750e-s.yml
@@ -3,7 +3,7 @@ profile: sonicfi_rap750e_s
 target: ipq53xx
 subtarget: generic
 description: Build image for the SONICFI RAP750E-S
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap750e_s-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap750e_s-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/sonicfi_rap750w-311a.yml b/profiles/sonicfi_rap750w-311a.yml
index c86b57675..5ff196647 100755
--- a/profiles/sonicfi_rap750w-311a.yml
+++ b/profiles/sonicfi_rap750w-311a.yml
@@ -3,7 +3,7 @@ profile: sonicfi_rap750w_311a
 target: ipq53xx
 subtarget: generic
 description: Build image for the SONICFI RAP750W-311A
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap750w_311a-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap750w_311a-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7
diff --git a/profiles/zyxel_nwa130be.yml b/profiles/zyxel_nwa130be.yml
index a29b2d2a1..c27589ae8 100644
--- a/profiles/zyxel_nwa130be.yml
+++ b/profiles/zyxel_nwa130be.yml
@@ -3,7 +3,7 @@ profile: zyxel_nwa130be
 target: ipq53xx
 subtarget: generic
 description: Build image for the zyxel nwa130be
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-zyxel_nwa130be-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-zyxel_nwa130be-squashfs-sysupgrade.bin
 feeds:
   - name: qca
     path: ../../feeds/qca-wifi-7