diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index a53865418a61..7a2b2ad967b3 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -11,3 +11,9 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_KPROBES=y
 CONFIG_QTI_SYS_PM_VX=y
 CONFIG_F2FS_CHECK_FS=y
+CONFIG_DEBUG_PREEMPT=y
+CONFIG_PANIC_ON_DATA_CORRUPTION=y
+CONFIG_PM_DEBUG=y
+CONFIG_DEBUG_RWSEMS=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_WQ_WATCHDOG=y