diff --git a/package/czechlight-rauc/rauc-mark-good.service b/package/czechlight-rauc/rauc-mark-good.service
index ae0ab6d..a51f490 100644
--- a/package/czechlight-rauc/rauc-mark-good.service
+++ b/package/czechlight-rauc/rauc-mark-good.service
@@ -1,11 +1,10 @@
 [Unit]
 Description=RAUC Good-marking Service
 ConditionKernelCommandLine=|rauc.slot
-After=sysrepod.service netopeer2-server.service
-Requires=sysrepod.service netopeer2-server.service
+Requires=multi-user.target
+After=multi-user.target
 
 [Service]
+Type=oneshot
+ExecStartPre=/bin/sh -c '[ "$(/bin/systemctl list-units --failed --all --no-legend --no-pager)" == "" ]'
 ExecStart=/usr/bin/rauc status mark-good
-
-[Install]
-WantedBy=multi-user.target