diff --git a/installer/modules.nix b/installer/modules.nix
index d69a837..9f59981 100644
--- a/installer/modules.nix
+++ b/installer/modules.nix
@@ -13,12 +13,15 @@
 #   inputs.athenix.nixosModules.sw
 
 { inputs }:
-# Automatically import all variant modules from variants/ directory
-# This returns an attribute set like: { nix-desktop = ...; nix-laptop = ...; nix-lxc = ...; sw = ...; }
-(import ../variants { inherit inputs; })
-// {
+# Expose hardware type modules from hw/ directory
+# This returns an attribute set like: { nix-desktop = ...; nix-laptop = ...; nix-lxc = ...; }
+let
+  hostTypes = import ../hw { inherit inputs; };
+in
+{
   # Software configuration module - main module with all athenix.sw options
   # Use athenix.sw.type to select profile: "desktop", "tablet-kiosk", "headless", "stateless-kiosk"
+  hw = hostTypes;
   sw =
     {
       inputs,