diff --git "a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" "b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount"
deleted file mode 100644
index 83db87260..000000000
--- "a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount"
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=NetworkManager system connections
-Requires=mnt-overlay.mount
-After=mnt-overlay.mount
-Before=NetworkManager.service
-
-[Mount]
-What=/mnt/overlay/etc/NetworkManager/system-connections
-Where=/etc/NetworkManager/system-connections
-Type=None
-Options=bind
-
-[Install]
-WantedBy=hassio-bind.target
diff --git "a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" "b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount"
new file mode 120000
index 000000000..61ec2cd7a
--- /dev/null
+++ "b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount"
@@ -0,0 +1 @@
+usr/lib/systemd/system/etc-NetworkManager-system\x2dconnections.mount
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount
deleted file mode 100644
index 73a513d0b..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Dropbear Host Key
-Requires=mnt-overlay.mount
-After=mnt-overlay.mount
-Before=dropbear.service
-
-[Mount]
-What=/mnt/overlay/etc/dropbear
-Where=/etc/dropbear
-Type=none
-Options=bind
-
-[Install]
-WantedBy=hassio-bind.target
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount
new file mode 120000
index 000000000..bed6d1cc0
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount
@@ -0,0 +1 @@
+usr/lib/systemd/system/etc-dropbear.mount
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount
deleted file mode 100644
index 38e6a467e..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount
+++ /dev/null
@@ -1,16 +0,0 @@
-[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
-Where=/var/lib/systemd
-Type=None
-Options=bind
-
-[Install]
-WantedBy=hassio-bind.target
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount
new file mode 120000
index 000000000..a0d4e52a7
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount
@@ -0,0 +1 @@
+usr/lib/systemd/system/var-lib-systemd.mount
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount
deleted file mode 100644
index 52900a054..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Systemd persistent logging
-DefaultDependencies=no
-Requires=mnt-overlay.mount systemd-tmpfiles-setup.service
-After=mnt-overlay.mount systemd-tmpfiles-setup.service
-Before=umount.target
-Conflicts=umount.target
-
-[Mount]
-What=/mnt/overlay/var/log/journal
-Where=/var/log/journal
-Type=None
-Options=bind
-
-[Install]
-WantedBy=hassio-bind.target
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount
new file mode 120000
index 000000000..f63cb3856
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount
@@ -0,0 +1 @@
+usr/lib/systemd/system/var-log-journal.mount
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount
deleted file mode 100644
index 38c7f3b82..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Hassio boot partition
-DefaultDependencies=no
-Before=umount.target
-After=local-fs.target
-Conflicts=umount.target
-
-[Mount]
-What=LABEL=hassio-boot
-Where=/mnt/boot
-Type=auto
-
-[Install]
-WantedBy=multi-user.target
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount
new file mode 120000
index 000000000..e23b5a033
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount
@@ -0,0 +1 @@
+usr/lib/systemd/system/mnt-boot.mount
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount
deleted file mode 100644
index 2c8fb8ac3..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Hassio data partition
-DefaultDependencies=no
-Before=umount.target
-Conflicts=umount.target
-
-[Mount]
-What=LABEL=hassio-data
-Where=/mnt/data
-Type=ext4
-
-[Install]
-WantedBy=multi-user.target
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount
new file mode 120000
index 000000000..b02e92ea7
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount
@@ -0,0 +1 @@
+usr/lib/systemd/system/mnt-data.mount
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount
deleted file mode 100644
index f648f6bfd..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Hassio overlay partition
-DefaultDependencies=no
-Before=umount.target
-Conflicts=umount.target
-
-[Mount]
-What=LABEL=hassio-overlay
-Where=/mnt/overlay
-Type=ext4
-
-[Install]
-WantedBy=multi-user.target
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount
new file mode 120000
index 000000000..b17c14b3c
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount
@@ -0,0 +1 @@
+usr/lib/systemd/system/mnt-overlay.mount
\ No newline at end of file
diff --git "a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" "b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount"
new file mode 100644
index 000000000..83db87260
--- /dev/null
+++ "b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount"
@@ -0,0 +1,14 @@
+[Unit]
+Description=NetworkManager system connections
+Requires=mnt-overlay.mount
+After=mnt-overlay.mount
+Before=NetworkManager.service
+
+[Mount]
+What=/mnt/overlay/etc/NetworkManager/system-connections
+Where=/etc/NetworkManager/system-connections
+Type=None
+Options=bind
+
+[Install]
+WantedBy=hassio-bind.target
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
new file mode 100644
index 000000000..73a513d0b
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-dropbear.mount
@@ -0,0 +1,14 @@
+[Unit]
+Description=Dropbear Host Key
+Requires=mnt-overlay.mount
+After=mnt-overlay.mount
+Before=dropbear.service
+
+[Mount]
+What=/mnt/overlay/etc/dropbear
+Where=/etc/dropbear
+Type=none
+Options=bind
+
+[Install]
+WantedBy=hassio-bind.target
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-bind.target
similarity index 100%
rename from buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target
rename to buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-bind.target
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount
new file mode 100644
index 000000000..38c7f3b82
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount
@@ -0,0 +1,14 @@
+[Unit]
+Description=Hassio boot partition
+DefaultDependencies=no
+Before=umount.target
+After=local-fs.target
+Conflicts=umount.target
+
+[Mount]
+What=LABEL=hassio-boot
+Where=/mnt/boot
+Type=auto
+
+[Install]
+WantedBy=multi-user.target
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount
new file mode 100644
index 000000000..2c8fb8ac3
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount
@@ -0,0 +1,13 @@
+[Unit]
+Description=Hassio data partition
+DefaultDependencies=no
+Before=umount.target
+Conflicts=umount.target
+
+[Mount]
+What=LABEL=hassio-data
+Where=/mnt/data
+Type=ext4
+
+[Install]
+WantedBy=multi-user.target
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount
new file mode 100644
index 000000000..f648f6bfd
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount
@@ -0,0 +1,13 @@
+[Unit]
+Description=Hassio overlay partition
+DefaultDependencies=no
+Before=umount.target
+Conflicts=umount.target
+
+[Mount]
+What=LABEL=hassio-overlay
+Where=/mnt/overlay
+Type=ext4
+
+[Install]
+WantedBy=multi-user.target
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
new file mode 100644
index 000000000..38e6a467e
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-systemd.mount
@@ -0,0 +1,16 @@
+[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
+Where=/var/lib/systemd
+Type=None
+Options=bind
+
+[Install]
+WantedBy=hassio-bind.target
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
new file mode 100644
index 000000000..52900a054
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-log-journal.mount
@@ -0,0 +1,16 @@
+[Unit]
+Description=Systemd persistent logging
+DefaultDependencies=no
+Requires=mnt-overlay.mount systemd-tmpfiles-setup.service
+After=mnt-overlay.mount systemd-tmpfiles-setup.service
+Before=umount.target
+Conflicts=umount.target
+
+[Mount]
+What=/mnt/overlay/var/log/journal
+Where=/var/log/journal
+Type=None
+Options=bind
+
+[Install]
+WantedBy=hassio-bind.target