diff --git a/recipes-bsp/firmware/firmware-qcom-rb1_20230724-v1.bb b/recipes-bsp/firmware/firmware-qcom-rb1_20230823-v2.bb
similarity index 82%
rename from recipes-bsp/firmware/firmware-qcom-rb1_20230724-v1.bb
rename to recipes-bsp/firmware/firmware-qcom-rb1_20230823-v2.bb
index 36b74c6e3..6e1e86337 100644
--- a/recipes-bsp/firmware/firmware-qcom-rb1_20230724-v1.bb
+++ b/recipes-bsp/firmware/firmware-qcom-rb1_20230823-v2.bb
@@ -4,8 +4,8 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.qcom.txt;md5=cbbe399f2c983ad51768f4561587f000"
 
 SRC_URI = "http://releases.linaro.org/96boards/rb1/qualcomm/firmware/RB1_firmware_${PV}.zip;subdir=${BP}"
-SRC_URI[md5sum] = "e2b940a74de03372f5f31ea4b1eb581b"
-SRC_URI[sha256sum] = "525fa292bbe605574f41c1b09204db907ccde6fb7fb78bda88837979821a762f"
+SRC_URI[md5sum] = "db892ca115845938c6672d756448d512"
+SRC_URI[sha256sum] = "e7f95cc61d601f6267f87741c333ec5663a6fb538c79770dc094c2556fa757c0"
 
 DEPENDS += "pil-squasher-native mtools-native"
 
@@ -17,9 +17,7 @@ do_compile:append() {
     pil-squasher 10-adreno-fw/a702_zap.mbn 10-adreno-fw/a702_zap.mdt
     pil-squasher 12-adsp_split/adsp.mbn 12-adsp_split/adsp.mdt
     pil-squasher 17-venus_split/venus.mbn 17-venus_split/venus.mdt
-    pil-squasher 33-modem/modem.mbn 33-modem/modem.mdt
-
-    mcopy -i 06-non-hlos/NON-HLOS.bin ::/image/wlanmdsp.mbn wlanmdsp.mbn
+    pil-squasher 32-modem/modem.mbn 32-modem/modem.mdt
 }
 
 ATH10K_PATH = "${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0"
@@ -34,12 +32,12 @@ do_install() {
 
     install -m 0444 10-adreno-fw/a702_zap.mbn ${D}${FW_QCOM_PATH}
     install -m 0444 12-adsp_split/adsp.mbn ${D}${FW_QCOM_PATH}
-    install -m 0444 33-modem/modem.mbn ${D}${FW_QCOM_PATH}
+    install -m 0444 32-modem/modem.mbn ${D}${FW_QCOM_PATH}
 
     install -m 0444 22-jsn/*jsn ${D}${FW_QCOM_PATH}
 
     install -d ${D}${ATH10K_PATH}
-    install -m 0444 wlanmdsp.mbn ${D}${ATH10K_PATH}/wlanmdsp-rb12.mbn
+    install -m 0444 33-wlanmdsp/wlanmdsp.mbn ${D}${ATH10K_PATH}/wlanmdsp-rb12.mbn
     ln -s ../../ath10k/WCN3990/hw1.0/wlanmdsp-rb12.mbn ${D}${FW_QCOM_PATH}/wlanmdsp.mbn
 
     install -d ${D}${FW_QCOM_BASE_PATH}/venus-6.0
diff --git a/recipes-bsp/firmware/firmware-qcom-rb2_20230724-v1.bb b/recipes-bsp/firmware/firmware-qcom-rb2_20230823-v2.bb
similarity index 86%
rename from recipes-bsp/firmware/firmware-qcom-rb2_20230724-v1.bb
rename to recipes-bsp/firmware/firmware-qcom-rb2_20230823-v2.bb
index 640021471..72c3ba034 100644
--- a/recipes-bsp/firmware/firmware-qcom-rb2_20230724-v1.bb
+++ b/recipes-bsp/firmware/firmware-qcom-rb2_20230823-v2.bb
@@ -4,8 +4,8 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.qcom.txt;md5=cbbe399f2c983ad51768f4561587f000"
 
 SRC_URI = "http://releases.linaro.org/96boards/rb2/qualcomm/firmware/RB2_firmware_${PV}.zip;subdir=${BP}"
-SRC_URI[md5sum] = "4f41d580ad42050009eea47cb563405e"
-SRC_URI[sha256sum] = "f72dd781008c9b4e3423e93696a2f62746ff681837bc3641cdf3c3338aed0e6b"
+SRC_URI[md5sum] = "53b6cda776cb534883e6c2a048ad97ec"
+SRC_URI[sha256sum] = "5d96c6f224cd4667afd47770b6cd0ad2ad912fe67fec86f4478ad8dcffae8531"
 
 DEPENDS += "pil-squasher-native"
 
@@ -17,7 +17,7 @@ do_compile:append() {
     pil-squasher 10-cdsp_split/cdsp.mbn 10-cdsp_split/cdsp.mdt
     pil-squasher 11-adreno-fw/a610_zap.mbn 11-adreno-fw/a610_zap.mdt
     pil-squasher 13-adsp_split/adsp.mbn 13-adsp_split/adsp.mdt
-    pil-squasher 34-modem/modem.mbn 34-modem/modem.mdt
+    pil-squasher 33-modem/modem.mbn 33-modem/modem.mdt
 }
 
 do_install() {
@@ -31,7 +31,7 @@ do_install() {
     install -m 0444 10-cdsp_split/cdsp.mbn ${D}${FW_QCOM_PATH}
     install -m 0444 11-adreno-fw/a610_zap.mbn ${D}${FW_QCOM_PATH}
     install -m 0444 13-adsp_split/adsp.mbn ${D}${FW_QCOM_PATH}
-    install -m 0444 34-modem/modem.mbn ${D}${FW_QCOM_PATH}
+    install -m 0444 33-modem/modem.mbn ${D}${FW_QCOM_PATH}
 
     # The file is installed in rb1 firmware recipe
     ln -s ../../ath10k/WCN3990/hw1.0/wlanmdsp-rb12.mbn ${D}${FW_QCOM_PATH}/wlanmdsp.mbn
diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-dragonboard410c.bb b/recipes-bsp/packagegroups/packagegroup-firmware-dragonboard410c.bb
index a142c4f96..8b55a3b68 100644
--- a/recipes-bsp/packagegroups/packagegroup-firmware-dragonboard410c.bb
+++ b/recipes-bsp/packagegroups/packagegroup-firmware-dragonboard410c.bb
@@ -5,5 +5,7 @@ inherit packagegroup
 RRECOMMENDS:${PN} += " \
     firmware-qcom-dragonboard410c \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a3xx', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-qcom-apq8016-wifi', '', d)} \
+    linux-firmware-qcom-apq8016-modem \
     linux-firmware-qcom-venus-1.8 \
 "