diff --git a/hardware/base.nix b/hardware/base.nix
index aefcfc3..866b36e 100644
--- a/hardware/base.nix
+++ b/hardware/base.nix
@@ -14,6 +14,9 @@
 
   boot.initrd.systemd.enable = true;
 
+  # prevents `systemd-vconsole-setup` failing during systemd initrd
+  systemd.services.systemd-vconsole-setup.unitConfig.After = "local-fs.target";
+
   services.smartd.enable = true;
   services.smartd.notifications.x11.enable = true;
 }
diff --git a/hosts/home-server/default.nix b/hosts/home-server/default.nix
index 0d9cd89..008c811 100644
--- a/hosts/home-server/default.nix
+++ b/hosts/home-server/default.nix
@@ -145,6 +145,7 @@ in
       authorizedKeys = config.users.users.felschr.openssh.authorizedKeys.keys;
     };
   };
+  boot.initrd.systemd.network.wait-online.enable = false;
   # allow automated decryption
   # `echo -n '<LUKS passphrase here>' | clevis encrypt tang '{"url": "http://doctr:9090"}' > home-server-enc.jwe`
   boot.initrd.clevis.enable = true;