diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service
index d5fb0b467..a187b789c 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=HassOS AppArmor
-Wants=hassos-supervisor.service network-online.target time-sync.target
+Wants=network-online.target time-sync.target
 After=network-online.target time-sync.target
-Before=docker.service hassos-supervisor.service
+Before=docker.service
 RequiresMountsFor=/mnt/data
 
 [Service]
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 98fe3e1be..3ebf6ff6f 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
@@ -2,7 +2,7 @@
 Description=HassOS supervisor
 Requires=docker.service rauc.service dbus.service
 Wants=network-online.target hassos-apparmor.service time-sync.target
-After=docker.service rauc.service dbus.service network-online.target time-sync.target
+After=docker.service rauc.service dbus.service network-online.target hassos-apparmor.service time-sync.target
 RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay
 StartLimitIntervalSec=60
 StartLimitBurst=5