diff --git a/arch/arm/configs/vendor/monaco-debug.config b/arch/arm/configs/vendor/monaco-debug.config
index 37ce1f596cc2..7d6b58921e38 100644
--- a/arch/arm/configs/vendor/monaco-debug.config
+++ b/arch/arm/configs/vendor/monaco-debug.config
@@ -1,7 +1,6 @@
 CONFIG_LOCALVERSION="-debug"
 CONFIG_HVC_DCC=y
 CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 CONFIG_DEBUG_STACK_USAGE=y
@@ -32,8 +31,6 @@ CONFIG_ARM_SMMU_TESTBUS_DUMP=y
 CONFIG_MSM_CORE_HANG_DETECT=y
 CONFIG_QCOM_SHOW_RESUME_IRQ=y
 CONFIG_SLUB_DEBUG_PANIC_ON=y
-CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y
-CONFIG_PAGE_POISONING_ENABLE_DEFAULT=y
 CONFIG_DEBUG_OBJECTS=y
 CONFIG_DEBUG_OBJECTS_FREE=y
 CONFIG_DEBUG_OBJECTS_TIMERS=y
@@ -55,3 +52,4 @@ CONFIG_SERIAL_MSM_GENI_CONSOLE=y
 CONFIG_MSM_GPI_DMA_DEBUG=y
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SDW_GCC_MONACO=y
+# CONFIG_PAGE_POISONING is not set
diff --git a/arch/arm/configs/vendor/monaco.config b/arch/arm/configs/vendor/monaco.config
index acf7173e77cd..4cbbb2f79d3c 100644
--- a/arch/arm/configs/vendor/monaco.config
+++ b/arch/arm/configs/vendor/monaco.config
@@ -578,3 +578,8 @@ CONFIG_PWM=y
 CONFIG_PWM_QTI_LPG=y
 CONFIG_TYPEC=y
 CONFIG_QPNP_SMBLITE=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=0
+CONFIG_ASHMEM=y
+CONFIG_ANDROID_VSOC=y
+CONFIG_ANDROID_BINDERFS=y