diff --git a/BoardConfig.mk b/BoardConfig.mk
index 551467b..797363f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -54,9 +54,9 @@ TARGET_SCREEN_DENSITY := 450
 TARGET_GRALLOC_HANDLE_HAS_UBWCP_FORMAT = true
 
 # DTB / DTBO
-# BOARD_INCLUDE_DTB_IN_BOOTIMG := true
-# BOARD_USES_QCOM_MERGE_DTBS_SCRIPT := true
-# TARGET_NEEDS_DTBOIMAGE := true
+BOARD_INCLUDE_DTB_IN_BOOTIMG := true
+BOARD_USES_QCOM_MERGE_DTBS_SCRIPT := true
+TARGET_NEEDS_DTBOIMAGE := true
 
 # Filesystem
 TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
@@ -66,12 +66,6 @@ BOARD_INIT_BOOT_HEADER_VERSION := 4
 BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION)
 
 # Kernel
-TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilts/kernel
-TARGET_PREBUILT_DTB := $(DEVICE_PATH)/prebuilts/dtb.img
-BOARD_MKBOOTIMG_ARGS += --dtb $(TARGET_PREBUILT_DTB)
-BOARD_INCLUDE_DTB_IN_BOOTIMG :=
-BOARD_PREBUILT_DTBOIMAGE := $(DEVICE_PATH)/prebuilts/dtbo.img
-BOARD_KERNEL_SEPARATED_DTBO :=
 BOARD_KERNEL_CMDLINE := \
     ignore_loglevel \
     debug \
@@ -216,7 +210,7 @@ TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
 BOARD_HAS_DOWNLOAD_MODE := true
 BOARD_INCLUDE_RECOVERY_DTBO := true
 BOARD_USES_FULL_RECOVERY_IMAGE := true
-BOARD_RECOVERY_MKBOOTIMG_ARGS := --header_version 2 --dtb $(TARGET_PREBUILT_DTB)
+BOARD_RECOVERY_MKBOOTIMG_ARGS := --header_version 2
 TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
 TARGET_USERIMAGES_USE_F2FS := true