diff --git a/hosts/types/nix-desktop.nix b/hosts/types/nix-desktop.nix
index 158ca8c..337bf3a 100644
--- a/hosts/types/nix-desktop.nix
+++ b/hosts/types/nix-desktop.nix
@@ -36,6 +36,6 @@
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  ugaif.sw.enable = true;
+  ugaif.sw.enable = lib.mkDefault true;
   ugaif.sw.type = lib.mkDefault "desktop";
 }
diff --git a/hosts/types/nix-ephemeral.nix b/hosts/types/nix-ephemeral.nix
index 8d0c0b6..dcb13b0 100644
--- a/hosts/types/nix-ephemeral.nix
+++ b/hosts/types/nix-ephemeral.nix
@@ -56,6 +56,6 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  ugaif.sw.enable = true;
+  ugaif.sw.enable = lib.mkDefault true;
   ugaif.sw.type = lib.mkDefault "stateless-kiosk";
 }
diff --git a/hosts/types/nix-laptop.nix b/hosts/types/nix-laptop.nix
index b692dc5..7e87e22 100644
--- a/hosts/types/nix-laptop.nix
+++ b/hosts/types/nix-laptop.nix
@@ -50,6 +50,6 @@
     };
   };
 
-  ugaif.sw.enable = true;
+  ugaif.sw.enable = lib.mkDefault true;
   ugaif.sw.type = lib.mkDefault "desktop";
 }
diff --git a/hosts/types/nix-lxc.nix b/hosts/types/nix-lxc.nix
index 383d46f..63d1ec6 100644
--- a/hosts/types/nix-lxc.nix
+++ b/hosts/types/nix-lxc.nix
@@ -41,6 +41,6 @@
     "proxmox"
   ];
 
-  ugaif.sw.enable = true;
+  ugaif.sw.enable = lib.mkDefault true;
   ugaif.sw.type = lib.mkDefault "headless";
 }
diff --git a/hosts/types/nix-surface.nix b/hosts/types/nix-surface.nix
index ea3d523..c04bd53 100644
--- a/hosts/types/nix-surface.nix
+++ b/hosts/types/nix-surface.nix
@@ -52,6 +52,6 @@ in
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  ugaif.sw.enable = true;
+  ugaif.sw.enable = lib.mkDefault true;
   ugaif.sw.type = lib.mkDefault "tablet-kiosk";
 }
diff --git a/hosts/types/nix-wsl.nix b/hosts/types/nix-wsl.nix
index dc95bf8..081bae3 100644
--- a/hosts/types/nix-wsl.nix
+++ b/hosts/types/nix-wsl.nix
@@ -22,7 +22,7 @@
     wsl.defaultUser = config.ugaif.host.wsl.user;
 
     # Enable the headless software profile
-    ugaif.sw.enable = true;
+    ugaif.sw.enable = lib.mkDefault true;
     ugaif.sw.type = lib.mkDefault "headless";
 
     # Fix for VS Code Server in WSL if needed, though vscode-server input exists