diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
index 6c71c34fa..3d91bae94 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=HassOS supervisor
-Requires=docker.service
+Requires=docker.service rauc.service dbus.service
 Wants=network-online.target
-After=docker.service rauc.service dbus.socket network-online.target
+After=docker.service rauc.service dbus.service network-online.target
 RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay
 StartLimitIntervalSec=60
 StartLimitBurst=5
+ConditionPathExists=/run/dbus/system_bus_socket /run/docker.socket
 
 [Service]
 Type=simple