diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-restore-etc.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-restore-etc.service
index 0540bc9..6e4514e 100644
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-restore-etc.service
+++ b/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-restore-etc.service
@@ -3,8 +3,8 @@
 DefaultDependencies=no
 Conflicts=umount.target
 Before=local-fs.target umount.target
-After=cfg-storage.service
-Requires=cfg-storage.service etc-overlay.service
+After=cfg.mount
+Requires=cfg.mount etc-overlay.service
 ConditionDirectoryNotEmpty=/cfg/etc
 
 [Service]
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
deleted file mode 100644
index 4ec5cde..0000000
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-storage.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Mount persistent config at /cfg
-DefaultDependencies=no
-Conflicts=umount.target
-Before=local-fs.target umount.target
-After=etc-overlay.service
-
-[Service]
-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,errors=panic /dev/mmcblk0p2 /cfg) || (grep -q rauc.slot=B /proc/cmdline && mount -o relatime,nodev,nosuid,errors=panic /dev/mmcblk0p4 /cfg)'
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/local-fs.target.wants/cfg-storage.service b/board/czechlight/common/overlay/usr/lib/systemd/system/local-fs.target.wants/cfg-storage.service
deleted file mode 120000
index 600c2b9..0000000
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/local-fs.target.wants/cfg-storage.service
+++ /dev/null
@@ -1 +0,0 @@
-../cfg-storage.service
\ No newline at end of file