diff --git a/conf/layer.conf b/conf/layer.conf
index 3184b66..33b2a5b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -15,7 +15,7 @@ BBMASK += "meta-compulab/recipes-kernel"
 BBMASK += "meta-compulab/recipes-graphics"
 BBMASK += ".*boundary.*"
 
-CORE_IMAGE_EXTRA_INSTALL += " kernel-modules kernel linux-compulab-headers firmware-imx-sdma-imx7d"
+CORE_IMAGE_EXTRA_INSTALL += " kernel-modules kernel linux-compulab-headers kernel-dev firmware-imx-sdma-imx7d"
 CORE_IMAGE_EXTRA_INSTALL += " packagegroup-tools-bluetooth "
 CORE_IMAGE_EXTRA_INSTALL += " grub "
 
diff --git a/recipes-kernel/linux/linux-compulab.inc b/recipes-kernel/linux/linux-compulab.inc
deleted file mode 100644
index 5520a99..0000000
--- a/recipes-kernel/linux/linux-compulab.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/compulab/imx8mm:"
-
-#include compulab/imx8mm.inc
-
-do_configure:append () {
-    mkdir ${S}/firmware/brcm -p
-    cp ${WORKDIR}/recipe-sysroot/${base_libdir}/firmware/brcm/bcm4339/4339.hcd ${S}/firmware/brcm/BCM4335C0.hcd
-    oe_runmake ${MACHINE}_defconfig
-}
-
-do_compile:prepend() {
-    export SOURCE_DATE_EPOCH=$(date +%s)
-}
-
-KERNEL_MODULE_AUTOLOAD += "goodix"
-
-COMPATIBLE_MACHINE = "(ucm-imx8m-mini|mcm-imx8m-mini|iot-gate-imx8)"
-
-DEPENDS += "firmware-imx"
diff --git a/recipes-kernel/linux/linux-compulab_5.15.32.bb b/recipes-kernel/linux/linux-compulab_5.15.32.bb
index 2609ecc..511a803 100644
--- a/recipes-kernel/linux/linux-compulab_5.15.32.bb
+++ b/recipes-kernel/linux/linux-compulab_5.15.32.bb
@@ -52,12 +52,48 @@ do_merge_config () {
     mv ${S}/${configs}/compulab_defconfig ${S}/${configs}/${MACHINE}_defconfig
 }
 
+FILES:${KERNEL_PACKAGE_NAME}-image:append = " /boot/kernel-${KERNEL_VERSION} /boot/config-${KERNEL_VERSION} "
+
 do_compile:prepend() {
     export SOURCE_DATE_EPOCH=$(date +%s)
 }
 
 do_install:append() {
-    oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
+    ln -s Image-${KERNEL_VERSION} ${D}/${KERNEL_IMAGEDEST}/kernel-${KERNEL_VERSION}
+    install -m 0644 ${B}/.config ${D}/${KERNEL_IMAGEDEST}/config-${KERNEL_VERSION}
+
+    INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-headers-${KERNEL_VERSION}
+    INSTALL_MOD_PATH=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
+
+    oe_runmake headers_install INSTALL_HDR_PATH=$INSTALL_HDR_PATH ARCH=$ARCH
+    install -m 0644 ${B}/.config ${INSTALL_HDR_PATH}/.config
+
+    (
+        cd ${S}
+        find . arch/$ARCH -maxdepth 1 -name Makefile\*
+        find include scripts -type f -o -type l
+        find arch/$ARCH -name Kbuild.platforms -o -name Platform
+        find $(find arch/$ARCH -name include -o -name scripts -type d) -type f
+    ) > ${WORKDIR}/temp/hdrsrcfiles
+
+    (
+        cd ${B}
+        echo tools/objtool/objtool
+        find arch/$ARCH/include Module.symvers include scripts -type f
+    ) > ${WORKDIR}/temp/hdrobjfiles
+
+	tar -c -f - -C ${S} -T ${WORKDIR}/temp/hdrsrcfiles | tar -xf - -C ${INSTALL_HDR_PATH}
+	tar -c -f - -C ${B} -T ${WORKDIR}/temp/hdrobjfiles | tar -xf - -C ${INSTALL_HDR_PATH}
+
+    (
+        for f in $(find ${INSTALL_HDR_PATH});do
+            file ${f} | awk -F":" '(/ELF.*x86-64/)&&($0="rm -rf "$1)' | sh -x
+        done
+    )
+    chown -R 0:0 ${INSTALL_HDR_PATH}
+
+    install -d 0755 ${INSTALL_MOD_PATH}
+    ln -s /usr/src/linux-headers-${KERNEL_VERSION} ${INSTALL_MOD_PATH}/build
 }
 
 do_kernel_localversion:prepend() {