diff --git a/board/myna-player-odyssey/rootfs_overlay/etc/systemd/system/rauc-failure.service b/board/myna-player-odyssey/rootfs_overlay/etc/systemd/system/rauc-failure.service
new file mode 100644
index 0000000..8cd235e
--- /dev/null
+++ b/board/myna-player-odyssey/rootfs_overlay/etc/systemd/system/rauc-failure.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Unit triggered on rauc-marking-good failing
+SuccessAction=reboot
+
+[Service]
+Type=oneshot
+ExecStart=/bin/true
diff --git a/board/myna-player-odyssey/rootfs_overlay/etc/systemd/system/rauc-mark-good.service b/board/myna-player-odyssey/rootfs_overlay/etc/systemd/system/rauc-mark-good.service
index 4880153..d6f067d 100644
--- a/board/myna-player-odyssey/rootfs_overlay/etc/systemd/system/rauc-mark-good.service
+++ b/board/myna-player-odyssey/rootfs_overlay/etc/systemd/system/rauc-mark-good.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Rauc marking good service
+After=NetworkManager.service serial-getty@ttySTM0.service sshd.service
+Requires=sshd.service serial-getty@ttySTM0.service NetworkManager.service
+OnFailure=rauc-failure.service
 
 [Service]
+Type=oneshot
 ExecStart=/usr/bin/rauc status mark-good
-
-[Install]
-WantedBy=multi-user.target