diff --git a/board/czechlight/common/mk-empty-cfg-fs.sh b/board/czechlight/common/mk-empty-cfg-fs.sh
index 90966c7..f4cbe1a 100755
--- a/board/czechlight/common/mk-empty-cfg-fs.sh
+++ b/board/czechlight/common/mk-empty-cfg-fs.sh
@@ -2,4 +2,4 @@
 
 CFG_FS=${BINARIES_DIR}/cfg.ext4
 rm -f ${CFG_FS}
-${HOST_DIR}/sbin/mkfs.ext4 -L cfg -O ^64bit -e panic ${CFG_FS} 256M
+${HOST_DIR}/sbin/mkfs.ext4 -L cfg ${CFG_FS} 256M
diff --git a/board/czechlight/common/overlay/etc/fstab b/board/czechlight/common/overlay/etc/fstab
index 92681bd..7517ca9 100644
--- a/board/czechlight/common/overlay/etc/fstab
+++ b/board/czechlight/common/overlay/etc/fstab
@@ -1,3 +1,3 @@
-/dev/root / auto ro 0 1
+/dev/root / auto ro,errors=panic 0 1
 tmpfs /var tmpfs mode=1777 0 0
 tmpfs /.ov tmpfs mode=0700 0 0
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-storage.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-storage.service
index e1256a8..4ec5cde 100644
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-storage.service
+++ b/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-storage.service
@@ -9,4 +9,4 @@
 Type=oneshot
 # This is ugly, but required due to the limitations of the mount units' names
 # (I need two "duplicates" which differ in the ConditionKernelCommandLine)
-ExecStart=/bin/sh -c '(grep -q rauc.slot=A /proc/cmdline && mount -o relatime,nodev,nosuid /dev/mmcblk0p2 /cfg) || (grep -q rauc.slot=B /proc/cmdline && mount -o relatime,nodev,nosuid /dev/mmcblk0p4 /cfg)'
+ExecStart=/bin/sh -c '(grep -q rauc.slot=A /proc/cmdline && mount -o relatime,nodev,nosuid,errors=panic /dev/mmcblk0p2 /cfg) || (grep -q rauc.slot=B /proc/cmdline && mount -o relatime,nodev,nosuid,errors=panic /dev/mmcblk0p4 /cfg)'