diff --git a/src/action/base/create_user.rs b/src/action/base/create_user.rs
index bf9cb59..7407e62 100644
--- a/src/action/base/create_user.rs
+++ b/src/action/base/create_user.rs
@@ -16,6 +16,7 @@ pub struct CreateUser {
     uid: u32,
     groupname: String,
     gid: u32,
+    comment: String,
 }
 
 impl CreateUser {
@@ -25,12 +26,14 @@ impl CreateUser {
         uid: u32,
         groupname: String,
         gid: u32,
+        comment: String,
     ) -> Result<StatefulAction<Self>, ActionError> {
         let this = Self {
             name: name.clone(),
             uid,
             groupname,
             gid,
+            comment,
         };
         // Ensure user does not exists
         if let Some(user) = User::from_name(name.as_str())
@@ -100,6 +103,7 @@ impl Action for CreateUser {
             uid,
             groupname,
             gid,
+            comment,
         } = self;
 
         use target_lexicon::OperatingSystem;
@@ -186,7 +190,7 @@ impl Action for CreateUser {
                                 "--home-dir",
                                 "/var/empty",
                                 "--comment",
-                                "Nix build user",
+                                &comment,
                                 "--gid",
                                 &gid.to_string(),
                                 "--groups",
@@ -212,7 +216,7 @@ impl Action for CreateUser {
                                 "--home",
                                 "/var/empty",
                                 "--gecos",
-                                "Nix build user",
+                                &comment,
                                 "--ingroup",
                                 groupname,
                                 "--system",
@@ -254,6 +258,7 @@ impl Action for CreateUser {
             uid: _,
             groupname: _,
             gid: _,
+            comment: _,
         } = self;
 
         use target_lexicon::OperatingSystem;
diff --git a/src/action/common/create_users_and_groups.rs b/src/action/common/create_users_and_groups.rs
index 6990e6b..e4795f3 100644
--- a/src/action/common/create_users_and_groups.rs
+++ b/src/action/common/create_users_and_groups.rs
@@ -28,13 +28,14 @@ impl CreateUsersAndGroups {
         )?;
         let mut create_users = Vec::with_capacity(settings.nix_build_user_count as usize);
         let mut add_users_to_groups = Vec::with_capacity(settings.nix_build_user_count as usize);
-        for index in 0..settings.nix_build_user_count {
+        for index in 1..=settings.nix_build_user_count {
             create_users.push(
                 CreateUser::plan(
                     format!("{}{index}", settings.nix_build_user_prefix),
                     settings.nix_build_user_id_base + index,
                     settings.nix_build_group_name.clone(),
                     settings.nix_build_group_id,
+                    format!("Nix build user {index}"),
                 )
                 .await
                 .map_err(|e| ActionError::Child(CreateUser::action_tag(), Box::new(e)))?,
diff --git a/tests/fixtures/linux/linux.json b/tests/fixtures/linux/linux.json
index 4921d4d..876854f 100644
--- a/tests/fixtures/linux/linux.json
+++ b/tests/fixtures/linux/linux.json
@@ -17,7 +17,7 @@
         "action": "provision_nix",
         "fetch_nix": {
           "action": {
-            "url": "https://releases.nixos.org/nix/nix-2.13.2/nix-2.13.2-x86_64-linux.tar.xz",
+            "url": "https://releases.nixos.org/nix/nix-2.13.3/nix-2.13.3-x86_64-linux.tar.xz",
             "dest": "/nix/temp-install-dir"
           },
           "state": "Uncompleted"
@@ -26,592 +26,624 @@
           "action": {
             "nix_build_user_count": 32,
             "nix_build_group_name": "nixbld",
-            "nix_build_group_id": 3000,
+            "nix_build_group_id": 30000,
             "nix_build_user_prefix": "nixbld",
-            "nix_build_user_id_base": 3000,
+            "nix_build_user_id_base": 30000,
             "create_group": {
               "action": {
                 "name": "nixbld",
-                "gid": 3000
+                "gid": 30000
               },
               "state": "Uncompleted"
             },
             "create_users": [
               {
                 "action": {
-                  "name": "nixbld0",
-                  "uid": 3000,
-                  "groupname": "nixbld",
-                  "gid": 3000
-                },
-                "state": "Uncompleted"
-              },
-              {
-                "action": {
+                  "comment": "Nix build user 1",
                   "name": "nixbld1",
-                  "uid": 3001,
+                  "uid": 30001,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 2",
                   "name": "nixbld2",
-                  "uid": 3002,
+                  "uid": 30002,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 3",
                   "name": "nixbld3",
-                  "uid": 3003,
+                  "uid": 30003,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 4",
                   "name": "nixbld4",
-                  "uid": 3004,
+                  "uid": 30004,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 5",
                   "name": "nixbld5",
-                  "uid": 3005,
+                  "uid": 30005,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 6",
                   "name": "nixbld6",
-                  "uid": 3006,
+                  "uid": 30006,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 7",
                   "name": "nixbld7",
-                  "uid": 3007,
+                  "uid": 30007,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 8",
                   "name": "nixbld8",
-                  "uid": 3008,
+                  "uid": 30008,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 9",
                   "name": "nixbld9",
-                  "uid": 3009,
+                  "uid": 30009,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 10",
                   "name": "nixbld10",
-                  "uid": 3010,
+                  "uid": 30010,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 11",
                   "name": "nixbld11",
-                  "uid": 3011,
+                  "uid": 30011,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 12",
                   "name": "nixbld12",
-                  "uid": 3012,
+                  "uid": 30012,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 13",
                   "name": "nixbld13",
-                  "uid": 3013,
+                  "uid": 30013,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 14",
                   "name": "nixbld14",
-                  "uid": 3014,
+                  "uid": 30014,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 15",
                   "name": "nixbld15",
-                  "uid": 3015,
+                  "uid": 30015,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 16",
                   "name": "nixbld16",
-                  "uid": 3016,
+                  "uid": 30016,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 17",
                   "name": "nixbld17",
-                  "uid": 3017,
+                  "uid": 30017,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 18",
                   "name": "nixbld18",
-                  "uid": 3018,
+                  "uid": 30018,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 19",
                   "name": "nixbld19",
-                  "uid": 3019,
+                  "uid": 30019,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 20",
                   "name": "nixbld20",
-                  "uid": 3020,
+                  "uid": 30020,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 21",
                   "name": "nixbld21",
-                  "uid": 3021,
+                  "uid": 30021,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 22",
                   "name": "nixbld22",
-                  "uid": 3022,
+                  "uid": 30022,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 23",
                   "name": "nixbld23",
-                  "uid": 3023,
+                  "uid": 30023,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 24",
                   "name": "nixbld24",
-                  "uid": 3024,
+                  "uid": 30024,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 25",
                   "name": "nixbld25",
-                  "uid": 3025,
+                  "uid": 30025,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 26",
                   "name": "nixbld26",
-                  "uid": 3026,
+                  "uid": 30026,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 27",
                   "name": "nixbld27",
-                  "uid": 3027,
+                  "uid": 30027,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 28",
                   "name": "nixbld28",
-                  "uid": 3028,
+                  "uid": 30028,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 29",
                   "name": "nixbld29",
-                  "uid": 3029,
+                  "uid": 30029,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 30",
                   "name": "nixbld30",
-                  "uid": 3030,
+                  "uid": 30030,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
+                  "comment": "Nix build user 31",
                   "name": "nixbld31",
-                  "uid": 3031,
+                  "uid": 30031,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
+                },
+                "state": "Uncompleted"
+              },
+              {
+                "action": {
+                  "comment": "Nix build user 32",
+                  "name": "nixbld32",
+                  "uid": 30032,
+                  "groupname": "nixbld",
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               }
             ],
             "add_users_to_groups": [
-              {
-                "action": {
-                  "name": "nixbld0",
-                  "uid": 3000,
-                  "groupname": "nixbld",
-                  "gid": 3000
-                },
-                "state": "Uncompleted"
-              },
               {
                 "action": {
                   "name": "nixbld1",
-                  "uid": 3001,
+                  "uid": 30001,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld2",
-                  "uid": 3002,
+                  "uid": 30002,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld3",
-                  "uid": 3003,
+                  "uid": 30003,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld4",
-                  "uid": 3004,
+                  "uid": 30004,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld5",
-                  "uid": 3005,
+                  "uid": 30005,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld6",
-                  "uid": 3006,
+                  "uid": 30006,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld7",
-                  "uid": 3007,
+                  "uid": 30007,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld8",
-                  "uid": 3008,
+                  "uid": 30008,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld9",
-                  "uid": 3009,
+                  "uid": 30009,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld10",
-                  "uid": 3010,
+                  "uid": 30010,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld11",
-                  "uid": 3011,
+                  "uid": 30011,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld12",
-                  "uid": 3012,
+                  "uid": 30012,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld13",
-                  "uid": 3013,
+                  "uid": 30013,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld14",
-                  "uid": 3014,
+                  "uid": 30014,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld15",
-                  "uid": 3015,
+                  "uid": 30015,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld16",
-                  "uid": 3016,
+                  "uid": 30016,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld17",
-                  "uid": 3017,
+                  "uid": 30017,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld18",
-                  "uid": 3018,
+                  "uid": 30018,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld19",
-                  "uid": 3019,
+                  "uid": 30019,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld20",
-                  "uid": 3020,
+                  "uid": 30020,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld21",
-                  "uid": 3021,
+                  "uid": 30021,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld22",
-                  "uid": 3022,
+                  "uid": 30022,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld23",
-                  "uid": 3023,
+                  "uid": 30023,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld24",
-                  "uid": 3024,
+                  "uid": 30024,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld25",
-                  "uid": 3025,
+                  "uid": 30025,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld26",
-                  "uid": 3026,
+                  "uid": 30026,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld27",
-                  "uid": 3027,
+                  "uid": 30027,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld28",
-                  "uid": 3028,
+                  "uid": 30028,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld29",
-                  "uid": 3029,
+                  "uid": 30029,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld30",
-                  "uid": 3030,
+                  "uid": 30030,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               },
               {
                 "action": {
                   "name": "nixbld31",
-                  "uid": 3031,
+                  "uid": 30031,
                   "groupname": "nixbld",
-                  "gid": 3000
+                  "gid": 30000
+                },
+                "state": "Uncompleted"
+              },
+              {
+                "action": {
+                  "name": "nixbld32",
+                  "uid": 30032,
+                  "groupname": "nixbld",
+                  "gid": 30000
                 },
                 "state": "Uncompleted"
               }
@@ -770,12 +802,6 @@
         "action": "configure_nix",
         "setup_default_profile": {
           "action": {
-            "channels": [
-              [
-                "nixpkgs",
-                "https://nixos.org/channels/nixpkgs-unstable"
-              ]
-            ],
             "unpacked_path": "/nix/temp-install-dir"
           },
           "state": "Uncompleted"
@@ -789,7 +815,7 @@
                   "path": "/etc/bashrc",
                   "user": null,
                   "group": null,
-                  "mode": 33188,
+                  "mode": 420,
                   "buf": "\n# Nix\nif [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then\n    . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'\nfi\n# End Nix\n\n        \n",
                   "position": "Beginning"
                 },
@@ -800,7 +826,7 @@
                   "path": "/etc/profile.d/nix.sh",
                   "user": null,
                   "group": null,
-                  "mode": 33188,
+                  "mode": 420,
                   "buf": "\n# Nix\nif [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then\n    . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'\nfi\n# End Nix\n\n        \n",
                   "position": "Beginning"
                 },
@@ -811,7 +837,7 @@
                   "path": "/etc/zshenv",
                   "user": null,
                   "group": null,
-                  "mode": 33188,
+                  "mode": 420,
                   "buf": "\n# Nix\nif [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then\n    . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'\nfi\n# End Nix\n\n        \n",
                   "position": "Beginning"
                 },
@@ -822,7 +848,7 @@
                   "path": "/etc/bash.bashrc",
                   "user": null,
                   "group": null,
-                  "mode": 33188,
+                  "mode": 420,
                   "buf": "\n# Nix\nif [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then\n    . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'\nfi\n# End Nix\n\n        \n",
                   "position": "Beginning"
                 },
@@ -849,10 +875,11 @@
                 "path": "/etc/nix/nix.conf",
                 "pending_nix_config": {
                   "settings": {
-                    "bash-prompt-prefix": "(nix:$name)\\040",
-                    "build-users-group": "nixbld",
+                    "experimental-features": "nix-command flakes",
                     "auto-optimise-store": "true",
-                    "experimental-features": "nix-command flakes"
+                    "extra-nix-path": "nixpkgs=flake:nixpkgs",
+                    "build-users-group": "nixbld",
+                    "bash-prompt-prefix": "(nix:$name)\\040"
                   }
                 }
               },
@@ -871,30 +898,43 @@
         "start_daemon": true
       },
       "state": "Uncompleted"
+    },
+    {
+      "action": {
+        "action": "remove_directory",
+        "path": "/nix/temp-install-dir"
+      },
+      "state": "Uncompleted"
     }
   ],
   "planner": {
     "planner": "linux",
     "settings": {
-      "channels": [
-        [
-          "nixpkgs",
-          "https://nixos.org/channels/nixpkgs-unstable"
-        ]
-      ],
       "modify_profile": true,
       "nix_build_user_count": 32,
       "nix_build_group_name": "nixbld",
-      "nix_build_group_id": 3000,
+      "nix_build_group_id": 30000,
       "nix_build_user_prefix": "nixbld",
-      "nix_build_user_id_base": 3000,
-      "nix_package_url": "https://releases.nixos.org/nix/nix-2.13.2/nix-2.13.2-x86_64-linux.tar.xz",
+      "nix_build_user_id_base": 30000,
+      "nix_package_url": "https://releases.nixos.org/nix/nix-2.13.3/nix-2.13.3-x86_64-linux.tar.xz",
       "extra_conf": [],
-      "force": false
+      "force": false,
+      "diagnostic_endpoint": "https://install.determinate.systems/nix/diagnostic"
     },
     "init": {
       "init": "Systemd",
       "start_daemon": true
     }
+  },
+  "diagnostic_data": {
+    "version": "0.5.1-unreleased",
+    "planner": "linux",
+    "configured_settings": [],
+    "os_name": "Ubuntu",
+    "os_version": "22.04.1 LTS (Jammy Jellyfish)",
+    "triple": "x86_64-unknown-linux-musl",
+    "is_ci": false,
+    "endpoint": "https://install.determinate.systems/nix/diagnostic",
+    "failure_chain": null
   }
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/linux/steam-deck.json b/tests/fixtures/linux/steam-deck.json
index 4d7316f..6afdf80 100644
--- a/tests/fixtures/linux/steam-deck.json
+++ b/tests/fixtures/linux/steam-deck.json
@@ -61,7 +61,7 @@
         "action": "provision_nix",
         "fetch_nix": {
           "action": {
-            "url": "https://releases.nixos.org/nix/nix-2.13.2/nix-2.13.2-x86_64-linux.tar.xz",
+            "url": "https://releases.nixos.org/nix/nix-2.13.3/nix-2.13.3-x86_64-linux.tar.xz",
             "dest": "/nix/temp-install-dir"
           },
           "state": "Uncompleted"
@@ -83,15 +83,7 @@
             "create_users": [
               {
                 "action": {
-                  "name": "nixbld0",
-                  "uid": 30000,
-                  "groupname": "nixbld",
-                  "gid": 30000
-                },
-                "state": "Uncompleted"
-              },
-              {
-                "action": {
+                  "comment": "Nix build user 1",
                   "name": "nixbld1",
                   "uid": 30001,
                   "groupname": "nixbld",
@@ -101,6 +93,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 2",
                   "name": "nixbld2",
                   "uid": 30002,
                   "groupname": "nixbld",
@@ -110,6 +103,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 3",
                   "name": "nixbld3",
                   "uid": 30003,
                   "groupname": "nixbld",
@@ -119,6 +113,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 4",
                   "name": "nixbld4",
                   "uid": 30004,
                   "groupname": "nixbld",
@@ -128,6 +123,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 5",
                   "name": "nixbld5",
                   "uid": 30005,
                   "groupname": "nixbld",
@@ -137,6 +133,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 6",
                   "name": "nixbld6",
                   "uid": 30006,
                   "groupname": "nixbld",
@@ -146,6 +143,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 7",
                   "name": "nixbld7",
                   "uid": 30007,
                   "groupname": "nixbld",
@@ -155,6 +153,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 8",
                   "name": "nixbld8",
                   "uid": 30008,
                   "groupname": "nixbld",
@@ -164,6 +163,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 9",
                   "name": "nixbld9",
                   "uid": 30009,
                   "groupname": "nixbld",
@@ -173,6 +173,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 10",
                   "name": "nixbld10",
                   "uid": 30010,
                   "groupname": "nixbld",
@@ -182,6 +183,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 11",
                   "name": "nixbld11",
                   "uid": 30011,
                   "groupname": "nixbld",
@@ -191,6 +193,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 12",
                   "name": "nixbld12",
                   "uid": 30012,
                   "groupname": "nixbld",
@@ -200,6 +203,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 13",
                   "name": "nixbld13",
                   "uid": 30013,
                   "groupname": "nixbld",
@@ -209,6 +213,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 14",
                   "name": "nixbld14",
                   "uid": 30014,
                   "groupname": "nixbld",
@@ -218,6 +223,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 15",
                   "name": "nixbld15",
                   "uid": 30015,
                   "groupname": "nixbld",
@@ -227,6 +233,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 16",
                   "name": "nixbld16",
                   "uid": 30016,
                   "groupname": "nixbld",
@@ -236,6 +243,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 17",
                   "name": "nixbld17",
                   "uid": 30017,
                   "groupname": "nixbld",
@@ -245,6 +253,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 18",
                   "name": "nixbld18",
                   "uid": 30018,
                   "groupname": "nixbld",
@@ -254,6 +263,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 19",
                   "name": "nixbld19",
                   "uid": 30019,
                   "groupname": "nixbld",
@@ -263,6 +273,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 20",
                   "name": "nixbld20",
                   "uid": 30020,
                   "groupname": "nixbld",
@@ -272,6 +283,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 21",
                   "name": "nixbld21",
                   "uid": 30021,
                   "groupname": "nixbld",
@@ -281,6 +293,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 22",
                   "name": "nixbld22",
                   "uid": 30022,
                   "groupname": "nixbld",
@@ -290,6 +303,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 23",
                   "name": "nixbld23",
                   "uid": 30023,
                   "groupname": "nixbld",
@@ -299,6 +313,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 24",
                   "name": "nixbld24",
                   "uid": 30024,
                   "groupname": "nixbld",
@@ -308,6 +323,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 25",
                   "name": "nixbld25",
                   "uid": 30025,
                   "groupname": "nixbld",
@@ -317,6 +333,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 26",
                   "name": "nixbld26",
                   "uid": 30026,
                   "groupname": "nixbld",
@@ -326,6 +343,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 27",
                   "name": "nixbld27",
                   "uid": 30027,
                   "groupname": "nixbld",
@@ -335,6 +353,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 28",
                   "name": "nixbld28",
                   "uid": 30028,
                   "groupname": "nixbld",
@@ -344,6 +363,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 29",
                   "name": "nixbld29",
                   "uid": 30029,
                   "groupname": "nixbld",
@@ -353,6 +373,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 30",
                   "name": "nixbld30",
                   "uid": 30030,
                   "groupname": "nixbld",
@@ -362,24 +383,26 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 31",
                   "name": "nixbld31",
                   "uid": 30031,
                   "groupname": "nixbld",
                   "gid": 30000
                 },
                 "state": "Uncompleted"
+              },
+              {
+                "action": {
+                  "comment": "Nix build user 32",
+                  "name": "nixbld32",
+                  "uid": 30032,
+                  "groupname": "nixbld",
+                  "gid": 30000
+                },
+                "state": "Uncompleted"
               }
             ],
             "add_users_to_groups": [
-              {
-                "action": {
-                  "name": "nixbld0",
-                  "uid": 30000,
-                  "groupname": "nixbld",
-                  "gid": 30000
-                },
-                "state": "Uncompleted"
-              },
               {
                 "action": {
                   "name": "nixbld1",
@@ -658,6 +681,15 @@
                   "gid": 30000
                 },
                 "state": "Uncompleted"
+              },
+              {
+                "action": {
+                  "name": "nixbld32",
+                  "uid": 30032,
+                  "groupname": "nixbld",
+                  "gid": 30000
+                },
+                "state": "Uncompleted"
               }
             ]
           },
@@ -814,12 +846,6 @@
         "action": "configure_nix",
         "setup_default_profile": {
           "action": {
-            "channels": [
-              [
-                "nixpkgs",
-                "https://nixos.org/channels/nixpkgs-unstable"
-              ]
-            ],
             "unpacked_path": "/nix/temp-install-dir"
           },
           "state": "Uncompleted"
@@ -833,7 +859,7 @@
                   "path": "/etc/bashrc",
                   "user": null,
                   "group": null,
-                  "mode": 33188,
+                  "mode": 420,
                   "buf": "\n# Nix\nif [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then\n    . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'\nfi\n# End Nix\n\n        \n",
                   "position": "Beginning"
                 },
@@ -844,7 +870,7 @@
                   "path": "/etc/profile.d/nix.sh",
                   "user": null,
                   "group": null,
-                  "mode": 33188,
+                  "mode": 420,
                   "buf": "\n# Nix\nif [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then\n    . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'\nfi\n# End Nix\n\n        \n",
                   "position": "Beginning"
                 },
@@ -855,7 +881,7 @@
                   "path": "/etc/zshenv",
                   "user": null,
                   "group": null,
-                  "mode": 33188,
+                  "mode": 420,
                   "buf": "\n# Nix\nif [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then\n    . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'\nfi\n# End Nix\n\n        \n",
                   "position": "Beginning"
                 },
@@ -866,7 +892,7 @@
                   "path": "/etc/bash.bashrc",
                   "user": null,
                   "group": null,
-                  "mode": 33188,
+                  "mode": 420,
                   "buf": "\n# Nix\nif [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then\n    . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'\nfi\n# End Nix\n\n        \n",
                   "position": "Beginning"
                 },
@@ -893,10 +919,11 @@
                 "path": "/etc/nix/nix.conf",
                 "pending_nix_config": {
                   "settings": {
-                    "bash-prompt-prefix": "(nix:$name)\\040",
-                    "build-users-group": "nixbld",
+                    "experimental-features": "nix-command flakes",
                     "auto-optimise-store": "true",
-                    "experimental-features": "nix-command flakes"
+                    "build-users-group": "nixbld",
+                    "extra-nix-path": "nixpkgs=flake:nixpkgs",
+                    "bash-prompt-prefix": "(nix:$name)\\040"
                   }
                 }
               },
@@ -923,27 +950,40 @@
         "enable": true
       },
       "state": "Uncompleted"
+    },
+    {
+      "action": {
+        "action": "remove_directory",
+        "path": "/nix/temp-install-dir"
+      },
+      "state": "Uncompleted"
     }
   ],
   "planner": {
     "planner": "steam-deck",
     "persistence": "/home/nix",
     "settings": {
-      "channels": [
-        [
-          "nixpkgs",
-          "https://nixos.org/channels/nixpkgs-unstable"
-        ]
-      ],
       "modify_profile": true,
       "nix_build_user_count": 32,
       "nix_build_group_name": "nixbld",
       "nix_build_group_id": 30000,
       "nix_build_user_prefix": "nixbld",
       "nix_build_user_id_base": 30000,
-      "nix_package_url": "https://releases.nixos.org/nix/nix-2.13.2/nix-2.13.2-x86_64-linux.tar.xz",
+      "nix_package_url": "https://releases.nixos.org/nix/nix-2.13.3/nix-2.13.3-x86_64-linux.tar.xz",
       "extra_conf": [],
-      "force": false
+      "force": false,
+      "diagnostic_endpoint": "https://install.determinate.systems/nix/diagnostic"
     }
+  },
+  "diagnostic_data": {
+    "version": "0.5.1-unreleased",
+    "planner": "steam-deck",
+    "configured_settings": [],
+    "os_name": "Ubuntu",
+    "os_version": "22.04.1 LTS (Jammy Jellyfish)",
+    "triple": "x86_64-unknown-linux-musl",
+    "is_ci": false,
+    "endpoint": "https://install.determinate.systems/nix/diagnostic",
+    "failure_chain": null
   }
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/macos/macos.json b/tests/fixtures/macos/macos.json
index 3efa22e..450cd37 100644
--- a/tests/fixtures/macos/macos.json
+++ b/tests/fixtures/macos/macos.json
@@ -114,15 +114,7 @@
             "create_users": [
               {
                 "action": {
-                  "name": "_nixbld0",
-                  "uid": 300,
-                  "groupname": "nixbld",
-                  "gid": 3000
-                },
-                "state": "Uncompleted"
-              },
-              {
-                "action": {
+                  "comment": "Nix build user 1",
                   "name": "_nixbld1",
                   "uid": 301,
                   "groupname": "nixbld",
@@ -132,6 +124,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 2",
                   "name": "_nixbld2",
                   "uid": 302,
                   "groupname": "nixbld",
@@ -141,6 +134,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 3",
                   "name": "_nixbld3",
                   "uid": 303,
                   "groupname": "nixbld",
@@ -150,6 +144,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 4",
                   "name": "_nixbld4",
                   "uid": 304,
                   "groupname": "nixbld",
@@ -159,6 +154,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 5",
                   "name": "_nixbld5",
                   "uid": 305,
                   "groupname": "nixbld",
@@ -168,6 +164,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 6",
                   "name": "_nixbld6",
                   "uid": 306,
                   "groupname": "nixbld",
@@ -177,6 +174,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 7",
                   "name": "_nixbld7",
                   "uid": 307,
                   "groupname": "nixbld",
@@ -186,6 +184,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 8",
                   "name": "_nixbld8",
                   "uid": 308,
                   "groupname": "nixbld",
@@ -195,6 +194,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 9",
                   "name": "_nixbld9",
                   "uid": 309,
                   "groupname": "nixbld",
@@ -204,6 +204,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 10",
                   "name": "_nixbld10",
                   "uid": 310,
                   "groupname": "nixbld",
@@ -213,6 +214,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 11",
                   "name": "_nixbld11",
                   "uid": 311,
                   "groupname": "nixbld",
@@ -222,6 +224,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 12",
                   "name": "_nixbld12",
                   "uid": 312,
                   "groupname": "nixbld",
@@ -231,6 +234,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 13",
                   "name": "_nixbld13",
                   "uid": 313,
                   "groupname": "nixbld",
@@ -240,6 +244,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 14",
                   "name": "_nixbld14",
                   "uid": 314,
                   "groupname": "nixbld",
@@ -249,6 +254,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 15",
                   "name": "_nixbld15",
                   "uid": 315,
                   "groupname": "nixbld",
@@ -258,6 +264,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 16",
                   "name": "_nixbld16",
                   "uid": 316,
                   "groupname": "nixbld",
@@ -267,6 +274,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 17",
                   "name": "_nixbld17",
                   "uid": 317,
                   "groupname": "nixbld",
@@ -276,6 +284,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 18",
                   "name": "_nixbld18",
                   "uid": 318,
                   "groupname": "nixbld",
@@ -285,6 +294,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 19",
                   "name": "_nixbld19",
                   "uid": 319,
                   "groupname": "nixbld",
@@ -294,6 +304,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 20",
                   "name": "_nixbld20",
                   "uid": 320,
                   "groupname": "nixbld",
@@ -303,6 +314,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 21",
                   "name": "_nixbld21",
                   "uid": 321,
                   "groupname": "nixbld",
@@ -312,6 +324,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 22",
                   "name": "_nixbld22",
                   "uid": 322,
                   "groupname": "nixbld",
@@ -321,6 +334,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 23",
                   "name": "_nixbld23",
                   "uid": 323,
                   "groupname": "nixbld",
@@ -330,6 +344,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 24",
                   "name": "_nixbld24",
                   "uid": 324,
                   "groupname": "nixbld",
@@ -339,6 +354,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 25",
                   "name": "_nixbld25",
                   "uid": 325,
                   "groupname": "nixbld",
@@ -348,6 +364,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 26",
                   "name": "_nixbld26",
                   "uid": 326,
                   "groupname": "nixbld",
@@ -357,6 +374,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 27",
                   "name": "_nixbld27",
                   "uid": 327,
                   "groupname": "nixbld",
@@ -366,6 +384,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 28",
                   "name": "_nixbld28",
                   "uid": 328,
                   "groupname": "nixbld",
@@ -375,6 +394,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 29",
                   "name": "_nixbld29",
                   "uid": 329,
                   "groupname": "nixbld",
@@ -384,6 +404,7 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 30",
                   "name": "_nixbld30",
                   "uid": 330,
                   "groupname": "nixbld",
@@ -393,24 +414,26 @@
               },
               {
                 "action": {
+                  "comment": "Nix build user 31",
                   "name": "_nixbld31",
                   "uid": 331,
                   "groupname": "nixbld",
                   "gid": 3000
                 },
                 "state": "Uncompleted"
+              },
+              {
+                "action": {
+                  "comment": "Nix build user 32",
+                  "name": "_nixbld32",
+                  "uid": 332,
+                  "groupname": "nixbld",
+                  "gid": 3000
+                },
+                "state": "Uncompleted"
               }
             ],
             "add_users_to_groups": [
-              {
-                "action": {
-                  "name": "_nixbld0",
-                  "uid": 300,
-                  "groupname": "nixbld",
-                  "gid": 3000
-                },
-                "state": "Uncompleted"
-              },
               {
                 "action": {
                   "name": "_nixbld1",
@@ -689,6 +712,15 @@
                   "gid": 3000
                 },
                 "state": "Uncompleted"
+              },
+              {
+                "action": {
+                  "name": "_nixbld32",
+                  "uid": 332,
+                  "groupname": "nixbld",
+                  "gid": 3000
+                },
+                "state": "Uncompleted"
               }
             ]
           },