diff --git a/arch/arm/configs/vendor/sdxnightjar-debug.config b/arch/arm/configs/vendor/sdxnightjar-debug.config
index e6acb44f3d31..6f78b1c4c2c1 100644
--- a/arch/arm/configs/vendor/sdxnightjar-debug.config
+++ b/arch/arm/configs/vendor/sdxnightjar-debug.config
@@ -839,3 +839,7 @@ CONFIG_MMC_SDHCI_MSM=y
 CONFIG_MMC_IPC_LOGGING=y
 CONFIG_QCOM_MEMORY_DUMP_V2=y
 CONFIG_MSM_PIL_MSS_QDSP6V5=y
+CONFIG_QCOM_WDT_CORE=y
+CONFIG_QCOM_SOC_WATCHDOG=y
+CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
+CONFIG_QCOM_WDOG_BITE_EARLY_PANIC=y
diff --git a/arch/arm/configs/vendor/sdxnightjar.config b/arch/arm/configs/vendor/sdxnightjar.config
index 9803e39fc9a7..a6cf92b6e8cc 100644
--- a/arch/arm/configs/vendor/sdxnightjar.config
+++ b/arch/arm/configs/vendor/sdxnightjar.config
@@ -862,3 +862,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_MSM=y
 CONFIG_MSM_PIL_MSS_QDSP6V5=y
+CONFIG_QCOM_WDT_CORE=y
+CONFIG_QCOM_SOC_WATCHDOG=y
+CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
+CONFIG_QCOM_WDOG_BITE_EARLY_PANIC=y