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 d223ec47c..dcaf96132 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://${DIGI_EULA_FILE};md5=8c0ad592dd48ace3d25eed5bbb26ba7
 
 # Selects whether to use proprietary or community driver
 QUALCOMM_WIFI_DRIVER ?= "proprietary"
-QUALCOMM_WIFI_DRIVER_ccimx8x = "community"
 
 FW_QUALCOMM_BT = " \
     file://qca/nvm_tlv_3.0.bin \
@@ -28,7 +27,7 @@ FW_QCA6564_WIFI_PROPRIETARY = " \
 # Firmware files for QCA6574 (Qualcomm proprietary driver)
 FW_QCA6574_WIFI_PROPRIETARY = " \
     file://LICENCE.atheros_firmware \
-    file://qca6574_proprietary/athwlan.bin \
+    file://qca6574_proprietary/qwlan30.bin \
     file://qca6574_proprietary/fakeboar.bin \
     file://qca6574_proprietary/otp.bin \
     file://qca6574_proprietary/utf.bin \
@@ -79,7 +78,8 @@ do_install() {
 		ln -s fakeboar.bin board.bin
 	else
 		if [ "${FW_QUALCOMM_WIFI}" = "${FW_QCA6574_WIFI_PROPRIETARY}" ]; then
-			ln -s athwlan.bin qwlan30.bin
+			ln -s qwlan30.bin athwlan.bin
+			ln -s otp.bin athsetup.bin
 		fi
 	fi
 }
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/athwlan.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/athwlan.bin
deleted file mode 100644
index 559ec1138..000000000
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/athwlan.bin and /dev/null differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/fakeboar.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/fakeboar.bin
index 05a657f70..adde1da09 100644
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/fakeboar.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/fakeboar.bin differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/otp.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/otp.bin
index 26d7a4a0a..2773e7ea2 100644
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/otp.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/otp.bin differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/qwlan30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/qwlan30.bin
new file mode 100644
index 000000000..c50ec790f
Binary files /dev/null and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/qwlan30.bin differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/utf.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/utf.bin
index af4edca20..d9a7ccfe6 100644
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/utf.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/utf.bin differ