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
index 960979156..c439aacf3 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount
@@ -1,9 +1,9 @@
 [Unit]
 Description=Hassio data partition
-Requires=hassio-expand.service
+Wants=hassio-expand.service
 DefaultDependencies=no
 After=hassio-expand.service
-Before=umount.target
+Before=umount.target systemd-tmpfiles-setup.service
 Conflicts=umount.target
 
 [Mount]