diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
index 600b196e1..9b693b85e 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
@@ -2,14 +2,15 @@
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI:append = " \
+SRC_URI:append:ccimx8m = " \
     file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch \
     file://0002-imx8m-soc.mak-capture-commands-output-into-a-log-fil.patch \
 "
 
-# Use NXP's lf-6.1.1_1.0.0 release for ccimx93
-SRCBRANCH:ccimx93 = "lf-6.1.1_1.0.0"
-SRCREV:ccimx93 = "d489494622585a47b4be88988595b0e4f9598f39"
+# Use NXP's lf-6.1.22-2.0.0 release for ccimx93
+SRC_URI:ccimx93 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH:ccimx93 = "lf-6.1.22_2.0.0"
+SRCREV:ccimx93 = "5cfd218012e080fb907d9cc301fbb4ece9bc17a9"
 
 DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
 
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
index 75f86c562..18a4a08c3 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
@@ -2,13 +2,14 @@
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI:append = " \
+SRC_URI:append:ccimx8m = " \
     file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch \
 "
 
-# Use NXP's lf-6.1.1_1.0.0 release for ccimx93
-SRCBRANCH:ccimx93 = "lf-6.1.1_1.0.0"
-SRCREV:ccimx93 = "d489494622585a47b4be88988595b0e4f9598f39"
+# Use NXP's lf-6.1.22-2.0.0 release for ccimx93
+SRC_URI:ccimx93 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH:ccimx93 = "lf-6.1.22_2.0.0"
+SRCREV:ccimx93 = "5cfd218012e080fb907d9cc301fbb4ece9bc17a9"
 
 # "fmacro-prefix-map" is not supported on old versions of GCC
 DEBUG_PREFIX_MAP:remove:class-nativesdk = "-fmacro-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"