diff --git a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
index 3b921dc9..5d90d31e 100644
--- a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
+++ b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
@@ -49,6 +49,9 @@ else
   KERN_OPTS="${KERN_OPTS} nmi_watchdog=panic,1 softlockup_panic=1"
 fi
 
+# Add kernel option to panic on a softdog timeout
+KERN_OPTS="${KERN_OPTS} softdog.soft_panic=1"
+
 if [[ "$(dmidecode -s system-product-name)" =~ ^ProLiant.*Gen8$ ]]; then
   KERN_OPTS="${KERN_OPTS} intel_iommu=on,eth_no_rmrr"
 else
diff --git a/bsp-files/kickstarts/post_kernel_controller.cfg b/bsp-files/kickstarts/post_kernel_controller.cfg
index e07540c0..bed07e4f 100644
--- a/bsp-files/kickstarts/post_kernel_controller.cfg
+++ b/bsp-files/kickstarts/post_kernel_controller.cfg
@@ -17,6 +17,9 @@ KERN_OPTS="${KERN_OPTS} selinux=0 enforcing=0"
 # Add kernel options to ensure NMI watchdog is enabled, if supported
 KERN_OPTS="${KERN_OPTS} nmi_watchdog=panic,1 softlockup_panic=1"
 
+# Add kernel option to panic on a softdog timeout
+KERN_OPTS="${KERN_OPTS} softdog.soft_panic=1"
+
 # Add kernel option to disable biosdevname if enabled
 # As this may already be in GRUB_CMDLINE_LINUX, only add if it is not already present
 grep -q '^GRUB_CMDLINE_LINUX=.*biosdevname=0' /etc/default/grub
diff --git a/bsp-files/kickstarts/post_kernel_storage.cfg b/bsp-files/kickstarts/post_kernel_storage.cfg
index ccc4a435..7452d800 100644
--- a/bsp-files/kickstarts/post_kernel_storage.cfg
+++ b/bsp-files/kickstarts/post_kernel_storage.cfg
@@ -11,6 +11,9 @@ KERN_OPTS="${KERN_OPTS} selinux=0 enforcing=0"
 # Add kernel options to ensure NMI watchdog is enabled, if supported
 KERN_OPTS="${KERN_OPTS} nmi_watchdog=panic,1 softlockup_panic=1"
 
+# Add kernel option to panic on a softdog timeout
+KERN_OPTS="${KERN_OPTS} softdog.soft_panic=1"
+
 # Add kernel option to disable biosdevname if enabled
 # As this may already be in GRUB_CMDLINE_LINUX, only add if it is not already present
 grep -q '^GRUB_CMDLINE_LINUX=.*biosdevname=0' /etc/default/grub