diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.service
index f07f2fbb9..1e7935471 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.service
@@ -7,3 +7,4 @@ RefuseManualStop=true
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/rauc status mark-good
+RemainAfterExit=true
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.timer b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.timer
index fa79b78fd..2d4016870 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.timer
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-good.timer
@@ -2,7 +2,7 @@
 Description=HassOS mark boot partition as good
 
 [Timer]
-OnBootSec=1min
+OnBootSec=30sec
 
 [Install]
 WantedBy=timers.target