diff --git a/modules/features/workstation-base.nix b/modules/features/workstation-base.nix
index 8d49c88..656ec9b 100644
--- a/modules/features/workstation-base.nix
+++ b/modules/features/workstation-base.nix
@@ -4,7 +4,7 @@ let
   homeModules = config.flake.modules.homeManager;
 in
 {
-  flake.modules.nixos.workstation-base = {
+  flake.modules.nixos.workstation = {
     imports = [
       nixosModules.audio
       nixosModules.bluetooth
@@ -30,14 +30,7 @@ in
     environment.localBinInPath = true;
   };
 
-  flake.modules.nixos.workstation-host = {
-    imports = [
-      nixosModules.workstation-base
-      nixosModules.qbittorrent-client
-    ];
-  };
-
-  flake.modules.homeManager.workstation-base = {
+  flake.modules.homeManager.workstation = {
     imports = [
       homeModules.ai
       homeModules.bitwarden
diff --git a/modules/hosts/polaris/default.nix b/modules/hosts/polaris/default.nix
index 025fbbb..2886a24 100644
--- a/modules/hosts/polaris/default.nix
+++ b/modules/hosts/polaris/default.nix
@@ -7,7 +7,7 @@ let
   nixosModules = config.flake.modules.nixos;
   homeModules = config.flake.modules.homeManager;
   metaLib = config.meta.lib;
-  workstationHomeImports = [ homeModules.workstation-base ];
+  workstationHomeImports = [ homeModules.workstation ];
   kiriHomeImports = workstationHomeImports ++ [
     homeModules.syncthing
     homeModules.qbittorrent-client
@@ -51,7 +51,7 @@ in
     };
 
     imports = [
-      nixosModules.workstation-host
+      nixosModules.workstation
       nixosModules.steam
       ./_hardware.nix
     ]
diff --git a/modules/hosts/zenith/default.nix b/modules/hosts/zenith/default.nix
index 9a1a966..d90b317 100644
--- a/modules/hosts/zenith/default.nix
+++ b/modules/hosts/zenith/default.nix
@@ -7,7 +7,7 @@ let
   nixosModules = config.flake.modules.nixos;
   homeModules = config.flake.modules.homeManager;
   metaLib = config.meta.lib;
-  workstationHomeImports = [ homeModules.workstation-base ];
+  workstationHomeImports = [ homeModules.workstation ];
   portableNoctalia = homeModules.noctalia-portable;
   kiriHomeImports = workstationHomeImports ++ [
     homeModules.syncthing
@@ -71,7 +71,7 @@ in
     };
 
     imports = [
-      nixosModules.workstation-host
+      nixosModules.workstation
       nixosModules.laptop-power
       {
         hardware.enableRedistributableFirmware = true;