diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc
new file mode 100644
index 000000000..f35d6dc74
--- /dev/null
+++ b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc
@@ -0,0 +1,28 @@
+# Copyright 2017-2018 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "i.MX M4 core Demo images"
+SECTION = "app"
+LICENSE = "Proprietary"
+
+inherit deploy fsl-eula2-unpack2
+
+SOC        ?= "INVALID"
+SOC_mx7ulp  = "imx7ulp"
+SOC_mx8mm   = "imx8mm"
+SOC_mx8mq   = "imx8mq"
+SOC_mx8qm   = "imx8qm"
+SOC_mx8qxp  = "imx8qx"
+
+IMX_PACKAGE_NAME = "${SOC}-m4-demo-${PV}"
+SRC_URI_append = ";name=${SOC}"
+
+SCR = "SCR-${SOC}-m4-demo.txt"
+
+do_deploy () {
+   # Install the demo binaries
+   cp ${D}/* ${DEPLOYDIR}/
+}
+addtask deploy after do_install
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.5.1.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.5.1.bb
deleted file mode 100644
index 82a68d2d7..000000000
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.5.1.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2017-2018 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-SUMMARY = "i.MX M4 core Demo images"
-SECTION = "app"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6dfb32a488e5fd6bae52fbf6c7ebb086"
-
-inherit deploy fsl-eula-unpack2
-
-SOC ?= "imx8qm"
-SOC_mx7ulp= "imx7ulp"
-SOC_mx8mm= "imx8mm"
-SOC_mx8mq= "imx8mq"
-SOC_mx8qm= "imx8qm"
-SOC_mx8qxp= "imx8qx"
-
-IMX_PACKAGE_NAME = "${SOC}-m4-demo-${PV}"
-SRC_URI_NAME = "${SOC}"
-
-SRC_URI[imx8qm.md5sum] = "d4b63215497b61fda8eff89a820aa0d4"
-SRC_URI[imx8qm.sha256sum] = "79d34ba2abcbaf02a8d01f5eb8c71e125aad34319bcc702815cf14d89a3d4e1f"
-
-SRC_URI[imx8qx.md5sum] = "c0201a442eaac19f9b929261d69f8d9b"
-SRC_URI[imx8qx.sha256sum] = "724676c9de95ca25beab1ce793fe170623b4b6d967ca07ddbf8cb4dbcbd15c8d"
-
-SCR = "SCR-${SOC}-m4-demo.txt"
-
-do_deploy () {
-   # Install the demo binaries
-   cp ${D}/* ${DEPLOYDIR}/
-}
-
-addtask deploy before do_build after do_install
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp)"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.5.2.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.5.2.bb
new file mode 100644
index 000000000..910b7618e
--- /dev/null
+++ b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.5.2.bb
@@ -0,0 +1,14 @@
+# Copyright 2017-2019 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-m4-demos-2.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28"
+
+SRC_URI[imx8qm.md5sum] = "6423c4c60412b509b6d7537ce1a3fd44"
+SRC_URI[imx8qm.sha256sum] = "cf430d4a111370c021435e864666d34fae4c4242907c195aad0c46c48073f78f"
+
+SRC_URI[imx8qx.md5sum] = "fe2e5c9513faac946d29e5904bf792d9"
+SRC_URI[imx8qx.sha256sum] = "151c6a578f6ae5a09b378015116061875047e4f3b6264e4becc80276621893b1"
+
+COMPATIBLE_MACHINE = "(mx8qm|mx8qxp)"