diff --git a/build.config.msm.monaco b/build.config.msm.monaco
index 09ec0c1e55fe..86737d0c91bd 100644
--- a/build.config.msm.monaco
+++ b/build.config.msm.monaco
@@ -14,15 +14,21 @@ BOOT_IMAGE_HEADER_VERSION=4
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096
 BUILD_VENDOR_DLKM=1
+PREPARE_SYSTEM_DLKM=1
+SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
 SUPER_IMAGE_SIZE=0x10000000
 TRIM_UNUSED_MODULES=1
 BUILD_INIT_BOOT_IMG=1
+MODULES_LIST_ORDER="1"
+
 [ -z "${DT_OVERLAY_SUPPORT}" ] && DT_OVERLAY_SUPPORT=1
 
 if [ "${KERNEL_CMDLINE_CONSOLE_AUTO}" != "0" ]; then
-	KERNEL_VENDOR_CMDLINE+=' console=ttyMSM0,115200n8 earlycon=qcom_geni,0x4a98000 qcom_geni_serial.con_enabled=1 androidboot.first_stage_console=1 '
+	KERNEL_VENDOR_CMDLINE+=' console=ttyMSM0,115200n8 earlycon=qcom_geni,0x4a98000 qcom_geni_serial.con_enabled=1 '
 fi
 
+KERNEL_VENDOR_CMDLINE+=' bootconfig '
+
 ################################################################################
 ## Inheriting MSM configs
 . ${KERNEL_DIR}/build.config.msm.common