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 33ffcfcdc..69ab65a49 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -10,8 +10,8 @@ QUALCOMM_WIFI_DRIVER ?= "proprietary"
 
 # Bluetooth firmware files
 FW_QUALCOMM_BT = " \
-    file://${QCA_MODEL}_bt/nvm_tlv_3.2.bin \
-    file://${QCA_MODEL}_bt/rampatch_tlv_3.2.tlv \
+    file://qca65X4_bt/nvm_tlv_3.2.bin \
+    file://qca65X4_bt/rampatch_tlv_3.2.tlv \
 "
 
 # Firmware files for QCA6564 (Qualcomm proprietary driver)
@@ -81,6 +81,16 @@ do_install() {
 			ln -s otp30.bin ${D}${WIFI_FW_PATH}/athsetup.bin
 		fi
 	fi
+
+	# Disable IBS over H4 for all the platforms in the bluetooth firmware
+	printf \"\\x02\" | dd of="${D}${base_libdir}/firmware/qca/nvm_tlv_3.2.bin" bs=1 seek=54 count=1 conv=notrunc,fsync
+}
+
+do_install_append_ccimx6ul() {
+	# Disable DEEP SLEEP in the bluetooth firmware
+	printf \"\\x00\" | dd of="${D}${base_libdir}/firmware/qca/nvm_tlv_3.2.bin" bs=1 seek=74 count=1 conv=notrunc,fsync
+	# Enable Internal Clock in the bluetooth firmware
+	printf \"\\x01\\x00\" | dd of="${D}${base_libdir}/firmware/qca/nvm_tlv_3.2.bin" bs=1 seek=93 count=2 conv=notrunc,fsync
 }
 
 QCA_MODEL ?= "qca6564"
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_bt/nvm_tlv_3.2.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_bt/nvm_tlv_3.2.bin
deleted file mode 100644
index 2715082de..000000000
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_bt/nvm_tlv_3.2.bin and /dev/null differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_bt/rampatch_tlv_3.2.tlv b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_bt/rampatch_tlv_3.2.tlv
deleted file mode 100644
index def7cc30a..000000000
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6564_bt/rampatch_tlv_3.2.tlv and /dev/null differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_bt/nvm_tlv_3.2.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_bt/nvm_tlv_3.2.bin
similarity index 96%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_bt/nvm_tlv_3.2.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_bt/nvm_tlv_3.2.bin
index 6d531b2f0..5228c7196 100644
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_bt/nvm_tlv_3.2.bin and b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_bt/nvm_tlv_3.2.bin differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_bt/rampatch_tlv_3.2.tlv b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_bt/rampatch_tlv_3.2.tlv
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca6574_bt/rampatch_tlv_3.2.tlv
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_bt/rampatch_tlv_3.2.tlv