diff --git a/modules/system/envfs.nix b/modules/system/envfs.nix
index 462c9f03..68a617a5 100644
--- a/modules/system/envfs.nix
+++ b/modules/system/envfs.nix
@@ -1,7 +1,10 @@
 inputs:
 {
   options.nixos.system.envfs = let inherit (inputs.lib) mkOption types; in mkOption
-    { type = types.nullOr (types.submodule {}); default = {}; };
+  {
+    type = types.nullOr (types.submodule {});
+    default = if inputs.config.nixos.packages.packageSet == "workstation" then {} else null;
+  };
   config = let inherit (inputs.config.nixos.system) envfs; in inputs.lib.mkIf (envfs != null) (inputs.lib.mkMerge
   [
     (builtins.elemAt inputs.topInputs.envfs.nixosModules.envfs.imports 0 inputs)
diff --git a/modules/system/nix-ld.nix b/modules/system/nix-ld.nix
index 498400c0..e0d1b8f1 100644
--- a/modules/system/nix-ld.nix
+++ b/modules/system/nix-ld.nix
@@ -1,7 +1,10 @@
 inputs:
 {
   options.nixos.system.nix-ld = let inherit (inputs.lib) mkOption types; in mkOption
-    { type = types.nullOr (types.submodule {}); default = {}; };
+  {
+    type = types.nullOr (types.submodule {});
+    default = if inputs.config.nixos.packages.packageSet == "workstation" then {} else null;
+  };
   config = let inherit (inputs.config.nixos.system) nix-ld; in inputs.lib.mkIf (nix-ld != null)
   {
     programs.nix-ld = { enable = true; libraries = [ inputs.pkgs.steam-run.fhsenv ]; };