diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount
index ee63d2aac..7928c4b38 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount
@@ -1,6 +1,6 @@
 [Unit]
 Description=Docker persistent configuration
-Requires=mnt-overlay.mount docker.service
+Requires=mnt-overlay.mount
 After=mnt-overlay.mount
 Before=docker.service
 
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount
index cde08c18d..167a07850 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dropbear persistent keys
-Requires=mnt-overlay.mount dropbear.service
+Requires=mnt-overlay.mount
 After=mnt-overlay.mount
 Before=dropbear.service
 
diff --git "a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-machine\\x2did.mount" "b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-machine\\x2did.mount"
index 4ebace090..83c69d7e2 100644
--- "a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-machine\\x2did.mount"
+++ "b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-machine\\x2did.mount"
@@ -1,7 +1,7 @@
 [Unit]
 Description=Systemd persistent machine-id
 DefaultDependencies=no
-Requires=mnt-overlay.mount systemd-machine-id-commit.service
+Requires=mnt-overlay.mount
 After=mnt-overlay.mount
 Before=umount.target systemd-machine-id-commit.service
 Conflicts=umount.target
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.docker.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.docker.mount
index 6e486efd8..93e1c48b9 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.docker.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/root-.docker.mount
@@ -1,10 +1,8 @@
 [Unit]
 Description=Docker persistent user
-DefaultDependencies=no
 Requires=mnt-overlay.mount
 After=mnt-overlay.mount
-Before=umount.target
-Conflicts=umount.target
+Before=docker.service
 
 [Mount]
 What=/mnt/overlay/root/.docker
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-systemd.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-systemd.mount
index 38e6a467e..bc3119fdc 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-systemd.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-systemd.mount
@@ -1,10 +1,7 @@
 [Unit]
 Description=Systemd persistent state
-DefaultDependencies=no
 Requires=mnt-overlay.mount
 After=mnt-overlay.mount
-Before=umount.target
-Conflicts=umount.target
 
 [Mount]
 What=/mnt/overlay/var/lib/systemd
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-log-journal.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-log-journal.mount
index b08a861a1..3323ab8f3 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-log-journal.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-log-journal.mount
@@ -1,10 +1,8 @@
 [Unit]
 Description=Systemd persistent logging
-DefaultDependencies=no
 Requires=mnt-overlay.mount
 After=mnt-overlay.mount
-Before=umount.target systemd-journal-flush.service
-Conflicts=umount.target
+Before=systemd-journal-flush.service
 
 [Mount]
 What=/mnt/overlay/var/log/journal
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-run.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-run.service
index 4796f9090..5c9d0d46d 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-run.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-run.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Hassio ZRAM run
-Requires=run.mount
-Before=run.mount
 
 [Service]
 Type=oneshot
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service
index 7f2ace7c7..67263f938 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Hassio ZRAM swap
-Requires=dev-zram0.swap
 Before=dev-zram0.swap
 
 [Service]
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service
index a255186e3..735c53378 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Hassio ZRAM tmp
-Requires=tmp.mount
 Before=tmp.mount
 
 [Service]
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service
index 7b6e2e6b9..b2c81d09d 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Hassio ZRAM var
-Requires=var.mount
 Before=var.mount
 
 [Service]