diff --git a/meta-phosphor/recipes-core/systemd/systemd/40-hardware-watchdog.conf b/meta-phosphor/recipes-core/systemd/systemd/40-hardware-watchdog.conf
index c323a22..ecc930f 100644
--- a/meta-phosphor/recipes-core/systemd/systemd/40-hardware-watchdog.conf
+++ b/meta-phosphor/recipes-core/systemd/systemd/40-hardware-watchdog.conf
@@ -1,3 +1,5 @@
 [Manager]
 RuntimeWatchdogSec=120s
+RuntimeWatchdogPreSec=90s
+RuntimeWatchdogPreGovernor=panic
 WatchdogDevice=/dev/watchdog