diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
index 243e82f50..ae5f12af8 100644
--- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
@@ -31,9 +31,9 @@ UBOOT_INSTALL_USB_INDEX = "0"
 UBOOT_INSTALL_SD_INDEX = "1"
 
 KERNEL_DEVICETREE ?= " \
-    imx6qp-ccimx6qpsbc.dtb \
-    imx6qp-ccimx6qpsbc-id160.dtb \
-    imx6qp-ccimx6qpsbc-wb.dtb \
+    digi/imx6qp-ccimx6qpsbc.dtb \
+    digi/imx6qp-ccimx6qpsbc-id160.dtb \
+    digi/imx6qp-ccimx6qpsbc-wb.dtb \
 "
 
 SERIAL_CONSOLES ?= "115200;ttymxc3"
diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index d832c16f6..3102c8970 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -29,16 +29,16 @@ UBOOT_INSTALL_USB_INDEX = "0"
 UBOOT_INSTALL_SD_INDEX = "1"
 
 KERNEL_DEVICETREE ?= " \
-    imx6dl-ccimx6sbc.dtb \
-    imx6dl-ccimx6sbc-w.dtb \
-    imx6dl-ccimx6sbc-wb.dtb \
-    imx6q-ccimx6sbc.dtb \
-    imx6q-ccimx6sbc-w.dtb \
-    imx6q-ccimx6sbc-wb.dtb \
-    imx6q-ccimx6sbc-wb-ldo-bypass.dtb \
-    imx6q-ccimx6sbc-id129.dtb \
-    imx6q-ccimx6sbc-id130.dtb \
-    imx6dl-ccimx6sbc-id131.dtb \
+    digi/imx6dl-ccimx6sbc.dtb \
+    digi/imx6dl-ccimx6sbc-w.dtb \
+    digi/imx6dl-ccimx6sbc-wb.dtb \
+    digi/imx6q-ccimx6sbc.dtb \
+    digi/imx6q-ccimx6sbc-w.dtb \
+    digi/imx6q-ccimx6sbc-wb.dtb \
+    digi/imx6q-ccimx6sbc-wb-ldo-bypass.dtb \
+    digi/imx6q-ccimx6sbc-id129.dtb \
+    digi/imx6q-ccimx6sbc-id130.dtb \
+    digi/imx6dl-ccimx6sbc-id131.dtb \
 "
 
 SERIAL_CONSOLES ?= "115200;ttymxc3"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index bd7e5bfa2..ea450aeeb 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -10,8 +10,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 #
 # Platform      Linux              U-Boot
 # -------------------------------------------------
-# ccimx6        5.15              2017.03
-# ccimx6qp      5.15              2017.03
+# ccimx6        6.6               2017.03
+# ccimx6qp      6.6               2017.03
 # ccimx6ul      6.6               2024.04
 # ccimx8x       6.6               2024.04 (packaged in imx-boot)
 # ccimx8mn      6.6               2024.04 (packaged in imx-boot)
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
deleted file mode 100644
index 2902ed23c..000000000
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (C) 2022-2025, Digi International Inc.
-
-require recipes-kernel/linux/linux-dey.inc
-
-SRCBRANCH = "v5.15.71/nxp/master"
-SRCBRANCH:stm32mpcommon = "v5.15.118/stm/master"
-SRCREV = "${AUTOREV}"
-SRCREV:stm32mpcommon = "${AUTOREV}"
-
-STM_RT_PATCHES = " \
-	file://patch-5.15.119-rt65.patch \
-	file://0023-5.15-stm32mp-rt-49-r1-CLOCK.patch \
-	file://0024-5.15-stm32mp-rt-49-r1-DMA.patch \
-	file://0025-5.15-stm32mp-rt-49-r1-MFD.patch \
-	file://0026-5.15-stm32mp-rt-49-r1-NET-TTY.patch \
-	file://0027-5.15-stm32mp-rt-49-r1-DEVICETREE.patch \
-	file://0028-5.15-stm32mp-rt-49-r1-CONFIG.patch \
-"
-
-SRC_URI:append:stm32mpcommon = " \
-	${@bb.utils.contains('DISTRO_FEATURES', 'rt', '${STM_RT_PATCHES}', '', d)} \
-"
-
-KERNEL_CONFIG_FRAGMENTS:append:stm32mpcommon = " ${@bb.utils.contains('DISTRO_FEATURES', 'rt', '${S}/arch/arm/configs/fragment-07-rt.config', '', d)}"
-KERNEL_CONFIG_FRAGMENTS:append:stm32mpcommon = " ${@bb.utils.contains('DISTRO_FEATURES', 'rt', '${S}/arch/arm/configs/fragment-07-rt-sysvinit.config', '', d)}"
-KERNEL_CONFIG_FRAGMENTS:append:ccmp13 = " ${@bb.utils.contains('DISTRO_FEATURES', 'rt', '${S}/arch/arm/configs/fragment-08-rt-mp13.config', '', d)}"
-
-do_assemble_fitimage:append:ccmp1() {
-	#
-	# Step 9: Add public keys to the different U-Boot dtb files
-	#
-	if [ "${UBOOT_SIGN_ENABLE}" = "1" ] && [ -n "${UBOOT_DEVICETREE}" ]; then
-		for devicetree in ${UBOOT_DEVICETREE}; do
-			if [ -f "${STAGING_DATADIR}/${devicetree}.dtb" ]; then
-				cp -P "${STAGING_DATADIR}/${devicetree}.dtb" ${B}
-
-				# Add image public key in U-Boot dtb file
-				fdt_add_pubkey -a "${FIT_HASH_ALG},${FIT_SIGN_ALG}" \
-							   -k "${UBOOT_SIGN_KEYDIR}" \
-							   -n "${UBOOT_SIGN_IMG_KEYNAME}" \
-							   -r "image" \
-							   "${B}/${devicetree}.dtb"
-
-				# Add configuration public key in U-Boot dtb file
-				fdt_add_pubkey -a "${FIT_HASH_ALG},${FIT_SIGN_ALG}" \
-							   -k "${UBOOT_SIGN_KEYDIR}" \
-							   -n "${UBOOT_SIGN_KEYNAME}" \
-							   -r "conf" \
-							   "${B}/${devicetree}.dtb"
-			fi
-		done
-	fi
-}
-
-kernel_do_deploy:append:ccmp1() {
-	if [ "${UBOOT_SIGN_ENABLE}" = "1" ] && \
-	   [ -n "${UBOOT_DTB_BINARY}" ] ; then
-		# Install device tree files with signature
-		if [ -n "${UBOOT_DEVICETREE}" ]; then
-			for devicetree in ${UBOOT_DEVICETREE}; do
-				if [ -f "${B}/${devicetree}.dtb" ]; then
-					install -m 0644 ${B}/${devicetree}.dtb "${DEPLOYDIR}/${FIP_UBOOT_DTB}-${devicetree}-with-signature.dtb"
-				fi
-			done
-		fi
-	fi
-}
-
-COMPATIBLE_MACHINE = "(ccimx6$)"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
index 9e0f4a16d..685438ef8 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
@@ -60,4 +60,4 @@ do_install:append:stm32mpcommon() {
 
 FILES:${KERNEL_PACKAGE_NAME}-modules:stm32mpcommon += "${sysconfdir}/modprobe.d"
 
-COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x|ccimx9|ccmp2|ccmp1)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx9|ccmp2|ccmp1)"