diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index 9d76e4c37..c10b3fd6a 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -5,11 +5,13 @@
 # Contains the ConnectCore 6 module.
 include conf/machine/include/ccimx6.inc
 
-HAS_WIFI_VIRTWLANS = "false"
+# Wireless external module
+WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
+HAS_WIFI_VIRTWLANS = "true"
 
 # Firmware
-MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
-MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}"
+MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k firmware-qualcomm-qca6564-bt', '', d)}"
+MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl firmware-qualcomm-qca6564-wifi', '', d)}"
 
 PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d"
 
diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb
index 98c66489d..5b53bf943 100644
--- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb
+++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb
@@ -16,4 +16,3 @@ RDEPENDS_${PN} = "\
 "
 
 RDEPENDS_${PN}_append_ccimx6sbc = " ath-prop-tools"
-RDEPENDS_${PN}_remove_ccimx6sbc = "hostapd"