diff --git a/board/czechlight/beaglebone/barebox.env/boot/sd b/board/czechlight/beaglebone/barebox.env/boot/sd
index a25f2d8..2aa7912 100644
--- a/board/czechlight/beaglebone/barebox.env/boot/sd
+++ b/board/czechlight/beaglebone/barebox.env/boot/sd
@@ -8,3 +8,4 @@
 # global.bootm.initrd=<path to initrd>
 
 global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
+global.linux.bootargs.base="omap_wdt.early_enable=1"
diff --git a/board/czechlight/beaglebone/barebox.env/config-board b/board/czechlight/beaglebone/barebox.env/config-board
index cd7b26d..042ed45 100644
--- a/board/czechlight/beaglebone/barebox.env/config-board
+++ b/board/czechlight/beaglebone/barebox.env/config-board
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 global.boot.default=sd
-
+global.boot.watchdog_timeout=60
diff --git a/board/czechlight/common/systemd-watchdog.sh b/board/czechlight/common/systemd-watchdog.sh
new file mode 100755
index 0000000..07ad9f0
--- /dev/null
+++ b/board/czechlight/common/systemd-watchdog.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -eux
+
+sed -i -E "s/(#?)ShutdownWatchdogSec=(.*)/ShutdownWatchdogSec=60/" ${TARGET_DIR}/etc/systemd/system.conf
+sed -i -E "s/(#?)RuntimeWatchdogSec=(.*)/RuntimeWatchdogSec=60/" ${TARGET_DIR}/etc/systemd/system.conf
diff --git a/configs/czechlight_beaglebone_defconfig b/configs/czechlight_beaglebone_defconfig
index ccc90de..4554f62 100644
--- a/configs/czechlight_beaglebone_defconfig
+++ b/configs/czechlight_beaglebone_defconfig
@@ -11,7 +11,7 @@
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/overlay/ $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/overlay/"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/dhcp-network.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/dhcp-network.sh $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/systemd-watchdog.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/beaglebone/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y