diff --git a/roles/nfs-mounts/default.nix b/roles/nfs-mounts/default.nix
index 67be937..b3314b9 100644
--- a/roles/nfs-mounts/default.nix
+++ b/roles/nfs-mounts/default.nix
@@ -31,16 +31,20 @@ in
     };
   };
 
-  config = mkIf cfg.enable
-    {
-      fileSystems.${cfg.mountPoint} = {
-        device = "${cfg.server}:${cfg.remotePath}";
-        fsType = "nfs";
-        options = [
-          "defaults"
-          "nofail"
-          "softreval"
-        ];
-      };
+  config = mkIf cfg.enable {
+    fileSystems.${cfg.mountPoint} = {
+      device = "${cfg.server}:${cfg.remotePath}";
+      fsType = "nfs";
+      options = [
+        "defaults"
+        "nofail"
+        "softreval"
+        "_netdev"
+        "x-systemd.requires=network-online.target"
+        "x-systemd.after=network-online.target"
+        "x-systemd.automatic-mount=force"
+        "x-systemd.mount-timeout=90"
+      ];
     };
+  };
 }