diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index e055296c951..538ceeda2b5 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -29,6 +29,7 @@ let
       "multi-user.target"
       "getty.target"
       "network.target"
+      "network-online.target"
       "nss-lookup.target"
       "nss-user-lookup.target"
       "time-sync.target"
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 3d5e1dd51f5..2b720a93b89 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -45,8 +45,8 @@ in
 
         path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
 
-        wantedBy = [ "remote-fs-pre.target" "multi-user.target" ];
-        before = [ "remote-fs-pre.target" ];
+        wantedBy = [ "network-online.target" "multi-user.target" ];
+        before = [ "network-online.target" ];
         requires = [ "basic.target" "rpcbind.service" ];
         after = [ "basic.target" "rpcbind.service" "network.target" ];
 
@@ -69,8 +69,8 @@ in
 
         path = [ pkgs.sysvtools pkgs.utillinux ];
 
-        wantedBy = [ "remote-fs-pre.target" "multi-user.target" ];
-        before = [ "remote-fs-pre.target" ];
+        wantedBy = [ "network-online.target" "multi-user.target" ];
+        before = [ "network-online.target" ];
         requires = [ "rpcbind.service" ];
         after = [ "rpcbind.service" ];