diff --git a/lib/devos/mkSuites.nix b/lib/devos/mkSuites.nix
index 66a36ea1..45d8a10f 100644
--- a/lib/devos/mkSuites.nix
+++ b/lib/devos/mkSuites.nix
@@ -1,20 +1,20 @@
 { lib }:
 
-{ users, profiles, userProfiles, suites } @ args:
+{ suites, profiles } @ args:
 let
   inherit (lib) os;
 
-  definedSuites = suites {
-    inherit (args) users profiles userProfiles;
-  };
+  profileSet = lib.genAttrs' profiles (path: {
+     name = baseNameOf path;
+     value = os.mkProfileAttrs (toString path);
+  });
 
-  allProfiles = lib.collectProfiles profiles;
-
-  allUsers = lib.collectProfiles users;
-
-  createSuites = _: suites: lib.mapAttrs (_: v: os.profileMap v) suites // {
-    inherit allProfiles allUsers;
-  };
+  definedSuites = suites profileSet;
 
+  allProfiles = lib.collectProfiles profileSet;
 in
-lib.mapAttrs createSuites definedSuites
+lib.mapAttrs (_: v: os.profileMap v) definedSuites // {
+    inherit allProfiles;
+}
+
+