diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 126c46df..88992e60 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -20,6 +20,7 @@ TI_HSM_DEMO_FW_VERSION = "11.00.09"
 TI_PKA_FW_VERSION = "2.1.0"
 TI_IPC_EXAMPLES_FW_VERSION = "3.52.00.01"
 PCM6240_FW_VERSION = "1.0.0.0"
+IPUMM_FW_VERSION = "3.00.15.00"
 
 TI_LINUX_FW_SRCREV ?= "ec029baad8b4b147af8331a5e099ef891e5ae1f4"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
diff --git a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
index 246255e3..fbc6d956 100644
--- a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -1,7 +1,7 @@
-SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode"
-LICENSE = "TI-TSPA"
+SUMMARY = "Firmware for IPU to support Accelerated MM decode and encode"
 
-LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f"
+LICENSE = "TI-TSPA"
+LIC_FILES_CHKSUM = "file://LICENCE.ti-tspa;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
 
 COMPATIBLE_MACHINE = "am57xx"
 
@@ -9,59 +9,25 @@ inherit features_check
 
 REQUIRED_MACHINE_FEATURES = "mmip"
 
-SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master"
-
-SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"
-
-PV = "3.00.15.00"
-PR = "r7"
+require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
-require recipes-ti/includes/ti-paths.inc
+PV = "${IPUMM_FW_VERSION}"
+PR = "r8"
 
 inherit update-alternatives
 
-DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos"
-
-export HWVERSION = "ES10"
-export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti"
-
-export XDCVERSION = "ti-xdctools-tree"
-export BIOSVERSION = "ti-sysbios-tree"
-export IPCVERSION = "ti-ipc-tree"
-export CEVERSION = "ti-codec-engine-tree"
-export FCVERSION = "ti-framework-components-tree"
-export XDAISVERSION = "ti-xdais-tree"
-
-export TMS470CGTOOLPATH = "${M4_TOOLCHAIN_INSTALL_DIR}"
-export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
-
-EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}"
-
-do_configure() {
-    oe_runmake unconfig
-    oe_runmake vayu_smp_config
-}
-
-do_compile() {
-    oe_runmake
-}
-
 TARGET = "dra7-ipu2-fw.xem4"
-TARGET_MAP = "platform/ti/dce/baseimage/package/cfg/out/ipu/release/ipu.xem4.map"
 
 do_install() {
-    install -d ${D}${nonarch_base_libdir}/firmware
-    install -m 0644 ${S}/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET}.${BPN}
-    install -m 0644 ${S}/${TARGET_MAP} ${D}${nonarch_base_libdir}/firmware/${TARGET}.map
+    install -d ${D}${nonarch_base_libdir}/firmware/ti-ce-fw
+    install -m 0644 ${S}/ti-ce-fw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET}
 }
 
 ALTERNATIVE:${PN} = "dra7-ipu2-fw.xem4"
 ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}"
-ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}.${BPN}"
+ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET}"
 ALTERNATIVE_PRIORITY = "20"
 
-FILES:${PN} += "${nonarch_base_libdir}/firmware/*"
-
 # Disable the "buildpaths" check while we figure out how we are
 # going to address this issue.
 #