diff --git a/BoardConfig.mk b/BoardConfig.mk
index db099ec..3fe9fd5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -26,13 +26,18 @@ BOARD_USES_QCOM_HARDWARE := true
 TARGET_BOARD_PLATFORM := sdm710
 
 # Kernel
+TARGET_KERNEL_CONFIG := kunlun2_defconfig
 BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xA90000 androidboot.hardware=qcom androidboot.console=ttyMSM0 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 service_locator.enable=1 androidboot.configfs=true androidboot.usbcontroller=a600000.dwc3 swiotlb=1 loop.max_part=7
 BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_TAGS_OFFSET := 0x00000100
 BOARD_RAMDISK_OFFSET := 0x01000000
 BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
-TARGET_PREBUILT_KERNEL := device/lenovo/kunlun2/prebuilt/Image.gz-dtb
+BOARD_KERNEL_SEPARATED_DTBO := true
+TARGET_KERNEL_CLANG_COMPILE := true
+TARGET_KERNEL_SOURCE := kernel/lenovo/kunlun2
+TARGET_KERNEL_ARCH := arm64
+TARGET_KERNEL_VERSION := 4.9
 
 # Audio
 #USE_CUSTOM_AUDIO_POLICY := 1
@@ -60,6 +65,7 @@ DEVICE_FRAMEWORK_MANIFEST_FILE := $(DEVICE_PATH)/framework_manifest.xml
 
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
+BOARD_DTBOIMG_PARTITION_SIZE := 25165824
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
diff --git a/aosp.dependencies b/aosp.dependencies
index e26e4f7..3afd253 100644
--- a/aosp.dependencies
+++ b/aosp.dependencies
@@ -1,4 +1,9 @@
 [
+  {
+    "repository": "kernel_lenovo_kunlun2",
+    "target_path": "kernel/lenovo/kunlun2",
+    "branch": "eleven"
+  },
   {
     "remote": "pixel-devices-blobs",
     "repository": "vendor_lenovo_kunlun2",
diff --git a/prebuilt/Image.gz-dtb b/prebuilt/Image.gz-dtb
deleted file mode 100644
index 22c67d9..0000000
Binary files a/prebuilt/Image.gz-dtb and /dev/null differ