diff --git a/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb b/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
index 9f2f37f..92e6a51 100644
--- a/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
+++ b/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
@@ -10,7 +10,9 @@ NO_GENERIC_LICENSE[Firmware-cypress-bcm4343] = "LICENCE.cypress"
 inherit allarch
 
 SRC_URI = "git://github.com/murata-wireless/cyw-bt-patch;protocol=https"
-SRCREV = "f819145223f1f99d3fc81a62c2ea2789d797d7b0"
+SRCREV = "c5f1b13697d4ac8eec2cb6f21636085fbb55acd1"
+
+PV = "3.0"
 
 S = "${WORKDIR}/git"
 
@@ -19,7 +21,7 @@ PACKAGES =+ "${PN}-cypress-license"
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/brcm/
 
-    install -m 644 ${S}/CYW43430A1.1DX.hcd ${D}${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd
+    install -m 644 ${S}/BCM4343A1_001.002.009.0093.0395.1DX.hcd ${D}${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd
     install -m 644 ${S}/LICENCE.cypress ${D}${nonarch_base_libdir}/firmware/LICENCE.cypress_bcm4343
 }
 
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 551aaae..bd4cc83 100644
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -1,27 +1,28 @@
 FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/${PN}:"
 
 # Add calibration file
-SRC_URI_append_stm32mpcommon = " file://brcmfmac43430-sdio.txt "
+SRC_URI_append_stm32mpcommon = " git://github.com/murata-wireless/cyw-fmac-nvram.git;protocol=https;nobranch=1;name=nvram;destsuffix=nvram-murata "
+SRCREV_nvram = "45fe43ad51ad47a0c57ad307db3e87da766bf61e"
 SRC_URI_append_stm32mpcommon = " git://github.com/murata-wireless/cyw-fmac-fw.git;protocol=https;nobranch=1;name=murata;destsuffix=murata "
-SRCREV_murata = "8d87950bfad28c65926695b7357bd8995b60016a"
+SRCREV_murata = "52174a18134c7ef4a674ecd9fb68fc6e2bced969"
 SRCREV_FORMAT = "linux-firmware-murata"
 
 do_install_append_stm32mpcommon() {
    # Install calibration file
-   install -m 0644 ${WORKDIR}/brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/
-   install -m 0644 ${WORKDIR}/brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157c-dk2.txt
-   install -m 0644 ${WORKDIR}/brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157f-dk2.txt
+   install -m 0644 ${WORKDIR}/nvram-murata/cyfmac43430-sdio.1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt
+   install -m 0644 ${WORKDIR}/nvram-murata/cyfmac43430-sdio.1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157c-dk2.txt
+   install -m 0644 ${WORKDIR}/nvram-murata/cyfmac43430-sdio.1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157f-dk2.txt
 
    #take newest murata firmware
-   install -m 0644 ${WORKDIR}/murata/brcmfmac43430-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/
-   install -m 0644 ${WORKDIR}/murata/brcmfmac43430-sdio.1DX.clm_blob ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.clm_blob
+   install -m 0644 ${WORKDIR}/murata/cyfmac43430-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.bin
+   install -m 0644 ${WORKDIR}/murata/cyfmac43430-sdio.1DX.clm_blob ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.clm_blob
 }
 
 FILES_${PN}-bcm43430_append_stm32mpcommon = " \
   ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \
   ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157c-dk2.txt \
+  ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157f-dk2.txt \
   ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.clm_blob \
+  ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.bin \
 "
 RDEPENDS_${PN}-bcm43430_remove_stm32mpcommon = " ${PN}-cypress-license "
-
-RRECOMMENDS_${PN}-bcm43430_append_stm32mpcommon += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'wifi-suspend', '', d)}"