diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-CL-ROADMv2.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-CL-ROADMv2.service
index c41b229..ac74aa3 100644
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-CL-ROADMv2.service
+++ b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-CL-ROADMv2.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=CzechLight CL-ROADMv2 driver
 After=syslog.target network.target sysrepod.service
+Before=rauc-mark-good.service
 Requires=sysrepod.service
 PartOf=sysrepod.service
 StartLimitIntervalSec=0
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-STATIC-CL-ROADMv2.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-STATIC-CL-ROADMv2.service
index a4eb9b0..40174cb 100644
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-STATIC-CL-ROADMv2.service
+++ b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-STATIC-CL-ROADMv2.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=CzechLight dummy static data for the CL-ROADMv2
 After=syslog.target network.target sysrepod.service
+Before=rauc-mark-good.service
 Requires=sysrepod.service
 PartOf=sysrepod.service
 StartLimitIntervalSec=0
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service b/board/czechlight/common/overlay/usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service
new file mode 120000
index 0000000..fb70526
--- /dev/null
+++ b/board/czechlight/common/overlay/usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service
@@ -0,0 +1 @@
+../rauc-mark-good.service
\ No newline at end of file
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/rauc-mark-good.service b/board/czechlight/common/overlay/usr/lib/systemd/system/rauc-mark-good.service
new file mode 100644
index 0000000..ae0ab6d
--- /dev/null
+++ b/board/czechlight/common/overlay/usr/lib/systemd/system/rauc-mark-good.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=RAUC Good-marking Service
+ConditionKernelCommandLine=|rauc.slot
+After=sysrepod.service netopeer2-server.service
+Requires=sysrepod.service netopeer2-server.service
+
+[Service]
+ExecStart=/usr/bin/rauc status mark-good
+
+[Install]
+WantedBy=multi-user.target