diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index f44291aaadd2..9bc72b13c955 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -46,6 +46,8 @@ CONFIG_MSM_CORE_HANG_DETECT=m
 CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_LAHAINA_LLCC=m
 CONFIG_QCOM_IPCC=m
+CONFIG_QCOM_WATCHDOG=m
+CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
 CONFIG_QCOM_SCM=m
 CONFIG_QTEE_SHM_BRIDGE=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set