diff --git a/__vars.nix b/__vars.nix
index 77d9077..ab24700 100644
--- a/__vars.nix
+++ b/__vars.nix
@@ -1,7 +1,13 @@
 { lib, ... }: 
 with lib;
 {
-  # 
+  # CLIENT SPECIFIC IMPORTS
+  imports = [
+    ./zfs-management.nix
+    ./nfs-mount.nix 
+    ./keepalived.nix
+  ];
+  
   # SYSTEM
   vars.username  = "";
   vars.usermail  = "";
diff --git a/configuration.nix b/configuration.nix
index 8300a81..c362b31 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -27,8 +27,6 @@
       ./docker.nix
       ./docker-device-mapper.nix
     ] 
-    ++ lib.optionals (config.vars.host_type == "nas") [ ./service-zrepl.nix ]
-    ++ lib.optionals (config.vars.host_type == "worker") [ ./nfs-mount.nix ./keepalived.nix ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;