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 81a850754..33ffcfcdc 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -15,27 +15,28 @@ FW_QUALCOMM_BT = " \
 "
 
 # Firmware files for QCA6564 (Qualcomm proprietary driver)
-FW_QCA6564_WIFI_PROPRIETARY = " \
+FW_QCA65X4_SDIO_PROPRIETARY = " \
     file://bdwlan30_US.bin \
     file://LICENCE.atheros_firmware \
-    file://qca6564_proprietary/otp30.bin \
-    file://qca6564_proprietary/qwlan30.bin \
-    file://qca6564_proprietary/utf30.bin \
+    file://qca65X4_sdio_proprietary/otp30.bin \
+    file://qca65X4_sdio_proprietary/qwlan30.bin \
+    file://qca65X4_sdio_proprietary/utf30.bin \
 "
 
 # Firmware files for QCA6574 (Qualcomm proprietary driver)
-FW_QCA6574_WIFI_PROPRIETARY = " \
+FW_QCA65X4_PCIE_PROPRIETARY = " \
+    file://bdwlan30_US.bin \
     file://LICENCE.atheros_firmware \
-    file://qca6574_proprietary/qwlan30.bin \
-    file://qca6574_proprietary/fakeboar_US.bin \
-    file://qca6574_proprietary/otp.bin \
-    file://qca6574_proprietary/utf.bin \
+    file://qca65X4_pcie_proprietary/otp30.bin \
+    file://qca65X4_pcie_proprietary/qwlan30.bin \
+    file://qca65X4_pcie_proprietary/utf30.bin \
 "
 
 # Firmware files for QCA6574 (Qualcomm community driver)
 # NOTE: the community file 'board.bin' must be substituted by proprietary
-# 'fakeboar_US.bin'
+# 'bdwlan30_US.bin'
 FW_QCA6574_WIFI_COMMUNITY = " \
+    file://bdwlan30_US.bin \
     file://qca6574_community/board-2.bin \
     file://qca6574_community/firmware-4.bin \
     file://qca6574_community/firmware-6.bin \
@@ -44,8 +45,8 @@ FW_QCA6574_WIFI_COMMUNITY = " \
     file://qca6574_proprietary/fakeboar_US.bin \
 "
 
-FW_QUALCOMM_WIFI ?= "${FW_QCA6564_WIFI_PROPRIETARY}"
-FW_QUALCOMM_WIFI_ccimx8x = "${@oe.utils.conditional('QUALCOMM_WIFI_DRIVER', 'community', '${FW_QCA6574_WIFI_COMMUNITY}', '${FW_QCA6574_WIFI_PROPRIETARY}', d)}"
+FW_QUALCOMM_WIFI ?= "${FW_QCA65X4_SDIO_PROPRIETARY}"
+FW_QUALCOMM_WIFI_ccimx8x = "${@oe.utils.conditional('QUALCOMM_WIFI_DRIVER', 'community', '${FW_QCA6574_WIFI_COMMUNITY}', '${FW_QCA65X4_PCIE_PROPRIETARY}', d)}"
 
 SRC_URI = " \
     ${FW_QUALCOMM_BT} \
@@ -72,12 +73,12 @@ do_install() {
 	install -m 0644 ${FW_WIFI_FILES} ${D}${WIFI_FW_PATH}
 	if [ "${QUALCOMM_WIFI_DRIVER}" = "community" ]; then
 		# If using community driver, create symlink 'board.bin' to
-		# proprietary 'fakeboar_US.bin'
-		ln -s fakeboar_US.bin ${D}${WIFI_FW_PATH}/board.bin
+		# proprietary 'bdwlan30_US.bin'
+		ln -s bdwlan30_US.bin ${D}${WIFI_FW_PATH}/board.bin
 	else
-		if [ "${FW_QUALCOMM_WIFI}" = "${FW_QCA6574_WIFI_PROPRIETARY}" ]; then
+		if [ "${FW_QUALCOMM_WIFI}" = "${FW_QCA65X4_PCIE_PROPRIETARY}" ]; then
 			ln -s qwlan30.bin ${D}${WIFI_FW_PATH}/athwlan.bin
-			ln -s otp.bin ${D}${WIFI_FW_PATH}/athsetup.bin
+			ln -s otp30.bin ${D}${WIFI_FW_PATH}/athsetup.bin
 		fi
 	fi
 }
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/fakeboar_US.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8x/bdwlan30_US.bin
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/fakeboar_US.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8x/bdwlan30_US.bin
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/qca65X4_pcie_proprietary/otp30.bin
old mode 100644
new mode 100755
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/otp.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/otp30.bin
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/qca65X4_pcie_proprietary/qwlan30.bin
similarity index 68%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/qwlan30.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/qwlan30.bin
index 10c20eac4..7431c0001 100644
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/qwlan30.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_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/qca65X4_pcie_proprietary/utf30.bin
old mode 100644
new mode 100755
similarity index 77%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_proprietary/utf.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/utf30.bin
index 768150396..115fee910
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/qca65X4_pcie_proprietary/utf30.bin differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_proprietary/otp30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/otp30.bin
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_proprietary/otp30.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/otp30.bin
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_proprietary/qwlan30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/qwlan30.bin
similarity index 56%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_proprietary/qwlan30.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/qwlan30.bin
index 6d7e653b1..2924a342f 100644
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_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/qca6564_proprietary/utf30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/utf30.bin
old mode 100644
new mode 100755
similarity index 61%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_proprietary/utf30.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/utf30.bin
index 7f9f6589e..613a9470f
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_proprietary/utf30.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_sdio_proprietary/utf30.bin differ
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
index db2f73598..73d8df971 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
@@ -6,11 +6,9 @@ LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
 
 # Reference Qualcomm tag/version
-PV = "v4.2.89.63"
-PV_ccimx8x = "v4.0.11.208Q"
+PV = "v4.0.11.213X"
 
-SRCBRANCH = "qca6564/master"
-SRCBRANCH_ccimx8x = "qca6574/master"
+SRCBRANCH = "qca65X4/master"
 SRCREV = "${AUTOREV}"
 
 QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh
index 1e3b9ced5..bcc6e8a14 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh
@@ -109,15 +109,6 @@ esac
 		BDATA_WW="bdwlan30_World.bin"
 		BDATA_LINK="bdwlan30.bin"
 		UTFBDATA_LINK="utfbd30.bin"
-	elif [ -f "fakeboar_US.bin" ] || [ -f "fakeboar_World.bin" ]; then
-		BDATA_US="fakeboar_US.bin"
-		BDATA_WW="fakeboar_World.bin"
-		# Use different links for propietary and community drivers
-		if [ -f "board.bin" ]; then
-			BDATA_LINK="board.bin"
-		else
-			BDATA_LINK="fakeboar.bin"
-		fi
 	else
 		log "5" "[ERROR] Could not locate board data files"
 		exit 1