diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf
index 5a96462af..3815c3cf1 100644
--- a/meta-digi-arm/conf/layer.conf
+++ b/meta-digi-arm/conf/layer.conf
@@ -45,6 +45,7 @@ BBMASK += " \
     meta-st-stm32mp/recipes-core/base-files/base-files_%.bbappend \
     meta-st-stm32mp/recipes-core/busybox/busybox_%.bbappend \
     meta-st-stm32mp/recipes-core/systemd/systemd-conf_%.bbappend \
+    meta-st-stm32mp/recipes-kernel/linux/linux-stm32mp_5.15.bb \
 "
 
 # Tweak stm32mpu-ai dependencies to use ST's machine learning packages
diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 27e5699df..108ae839e 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -111,10 +111,9 @@ OPTEE_CONF = "ccmp13-dvk"
 # =========================================================================
 KERNEL_IMAGETYPE = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'fitImage', 'zImage', d)}"
 KERNEL_CLASSES = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'kernel-fitimage', 'kernel-uimage', d)}"
-KERNEL_ALT_IMAGETYPE = "Image uImage vmlinux"
+KERNEL_ALT_IMAGETYPE = "Image vmlinux"
 KERNEL_DEFCONFIG ?= "ccmp1_defconfig"
 KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig"
-ST_KERNEL_LOADADDR ?= "0xC0008000"
 
 # =========================================================================
 # DEY settings
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index bd6ce385f..fd5cba720 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -119,10 +119,9 @@ OPTEE_CONF = "ccmp15-dvk"
 # =========================================================================
 KERNEL_IMAGETYPE = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'fitImage', 'zImage', d)}"
 KERNEL_CLASSES = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'kernel-fitimage', 'kernel-uimage', d)}"
-KERNEL_ALT_IMAGETYPE = "Image uImage vmlinux"
+KERNEL_ALT_IMAGETYPE = "Image vmlinux"
 KERNEL_DEFCONFIG ?= "ccmp1_defconfig"
 KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig"
-ST_KERNEL_LOADADDR ?= "0xC0008000"
 
 # =========================================================================
 # DEY settings
diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index 049c14332..7e8324486 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -41,6 +41,7 @@ UBOOT_ENV_RANGE ?= ""
 MACHINE_EXTRA_RDEPENDS += " \
     mtd-utils-ubifs \
 "
+MACHINE_EXTRA_RRECOMMENDS:remove = "kernel-imagebootfs"
 
 # Image FS types
 IMAGE_FSTYPES:remove = "ext4 tar.xz"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index de58e8115..95f25cbfe 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 inherit kernel
 inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-kernel-localversion', '', d)}
-require ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)}
 require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-virtualization.inc', '', d)}
 require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/linux-trustfence.inc', '', d)}
 
@@ -30,8 +29,6 @@ OVERLAYS_DTC_FLAGS:ccimx6ul = ""
 OVERLAYS_DTC_FLAGS:ccimx6 = ""
 KERNEL_DTC_FLAGS = "${OVERLAYS_DTC_FLAGS}"
 
-KERNEL_EXTRA_ARGS:stm32mpcommon += "LOADADDR=${ST_KERNEL_LOADADDR}"
-
 # A user can provide his own kernel 'defconfig' file by:
 # - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file
 #   inside the kernel repository.