diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 108ae839e..814f87227 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -112,8 +112,7 @@ 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 vmlinux"
-KERNEL_DEFCONFIG ?= "ccmp1_defconfig"
-KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig"
+KERNEL_DEFCONFIG ?= "arch/arm/configs/ccmp1_defconfig"
 
 # =========================================================================
 # DEY settings
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index fd5cba720..1dc9362cf 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -120,8 +120,7 @@ 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 vmlinux"
-KERNEL_DEFCONFIG ?= "ccmp1_defconfig"
-KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig"
+KERNEL_DEFCONFIG ?= "arch/arm/configs/ccmp1_defconfig"
 
 # =========================================================================
 # DEY settings
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index 95f25cbfe..afda6fa1e 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -46,7 +46,13 @@ do_copy_defconfig () {
 		cp -f ${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig
 	fi
 }
-addtask copy_defconfig after do_patch before do_kernel_localversion
+
+python () {
+    if d.getVar('DEY_SOC_VENDOR') == "STM":
+        bb.build.addtask('copy_defconfig', 'do_configure', 'do_patch', d)
+    elif d.getVar('DEY_SOC_VENDOR') == "NXP":
+        bb.build.addtask('copy_defconfig', 'do_kernel_localversion', 'do_patch', d)
+}
 
 # This is needed because kernel_localversion (in fsl-kernel-localversion.bbclass)
 # creates a basic ${B}/.config file and because that file exists, kernel_do_configure