diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 5f7ea7d3c9b..6cd8b80f22a 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -150,6 +150,13 @@ let
       KillSignal=SIGHUP
     '';
 
+  fsTarget =
+    ''
+      [Unit]
+      Description=All File Systems
+      Wants=local-fs.target remote-fs.target
+    '';
+
   makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
 
   serviceConfig = { name, config, ... }: {
@@ -328,6 +335,7 @@ in
 
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
+      // { "fs.target" = { text = fsTarget; wantedBy = [ "multi-user.target" ]; }; }
       // mapAttrs serviceToUnit cfg.services;
 
   };