diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 687052e2abd6..40ae62d56949 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -232,3 +232,5 @@ CONFIG_SM_DISPCC_SHIMA=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=y
 CONFIG_INCREMENTAL_FS=m
 CONFIG_QCOM_MICRODUMP=m
+CONFIG_HH_VIRT_WATCHDOG=m
+CONFIG_QCOM_SOC_WATCHDOG=m