diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
index 2f13801b8..aa1203d7d 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Digi International.
+# Copyright (C) 2016-2022 Digi International.
 
 SUMMARY = "Qualcomm firmware files for Digi's platforms."
 SECTION = "base"
@@ -38,10 +38,10 @@ FW_QCA65X4_SDIO_PROPRIETARY = " \
 
 # Firmware files for QCA6574 (Qualcomm proprietary driver)
 FW_QCA65X4_PCIE_PROPRIETARY = " \
-    file://bdwlan30_US.bin \
+    file://fakeboar_US.bin \
     file://LICENCE.atheros_firmware \
-    file://qca65X4_pcie_proprietary/otp30.bin \
-    file://qca65X4_pcie_proprietary/qwlan30.bin \
+    file://qca65X4_pcie_proprietary/otp.bin \
+    file://qca65X4_pcie_proprietary/athwlan.bin \
     file://qca65X4_pcie_proprietary/utf.bin \
 "
 
@@ -97,12 +97,11 @@ do_install() {
 		ln -s /proc/device-tree/wireless/mac-address3 ${D}${WIFI_FW_PATH}/wlan/wlan_mac3
 
 		# Create symbolic links to the proper FW files depending on the country region
-		ln -s bdwlan30_US.bin ${D}${WIFI_FW_PATH}/bdwlan30.bin
-		ln -s bdwlan30_US.bin ${D}${WIFI_FW_PATH}/utfbd30.bin
-
 		if [ "${FW_QUALCOMM_WIFI}" = "${FW_QCA65X4_PCIE_PROPRIETARY}" ]; then
-			ln -s qwlan30.bin ${D}${WIFI_FW_PATH}/athwlan.bin
-			ln -s otp30.bin ${D}${WIFI_FW_PATH}/athsetup.bin
+			ln -s fakeboar_US.bin ${D}${WIFI_FW_PATH}/fakeboar.bin
+		else
+			ln -s bdwlan30_US.bin ${D}${WIFI_FW_PATH}/bdwlan30.bin
+			ln -s bdwlan30_US.bin ${D}${WIFI_FW_PATH}/utfbd30.bin
 		fi
 	fi
 
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8x/bdwlan30_US.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8x/fakeboar_US.bin
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8x/bdwlan30_US.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8x/fakeboar_US.bin
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/qwlan30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/athwlan.bin
old mode 100644
new mode 100755
similarity index 59%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/qwlan30.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/athwlan.bin
index 28e658fd3..782d3d917
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/qwlan30.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/athwlan.bin differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/otp30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/otp.bin
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/otp30.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/otp.bin
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/utf.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/utf.bin
index b2bd62cf5..4dc57b3df 100755
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/utf.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/utf.bin differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/otp30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/otp30.bin
old mode 100644
new mode 100755
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/qwlan30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/qwlan30.bin
old mode 100644
new mode 100755
index 2312310e7..791c043e5
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/qwlan30.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/qwlan30.bin differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/utf30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/utf30.bin
index 21b634461..d235e220b 100755
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/utf30.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/utf30.bin differ