diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index faf7462ef..7a6d1ff2a 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -51,7 +51,7 @@ nav:
       - Disk Encryption: getting-started/disk-encryption.md
       - Mesh VPN: getting-started/mesh-vpn.md
       - Backup & Restore: getting-started/backups.md
-      - Machines: manual/include-machines.md
+      - Adding Machines: manual/adding-machines.md
       - Inventory: manual/inventory.md
       - Secrets: manual/secrets.md
       - Secure Boot: manual/secure-boot.md
diff --git a/docs/site/manual/index.md b/docs/site/manual/index.md
index 865210c2d..143807602 100644
--- a/docs/site/manual/index.md
+++ b/docs/site/manual/index.md
@@ -33,7 +33,7 @@ Instructions and explanations for practical Implementations ordered by Topics.
 
 <div class="grid cards" markdown>
 
--   [Machines](./include-machines.md)
+-   [Machines](./adding-machines.md)
 
     ---
 
diff --git a/docs/site/reference/index.md b/docs/site/reference/index.md
index 3e4b55dca..3c3b4bc06 100644
--- a/docs/site/reference/index.md
+++ b/docs/site/reference/index.md
@@ -7,7 +7,7 @@ This section of the site provides an **automatically extracted** overview of the
 - Learn how to use the [Clan CLI](./cli/index.md)
 - Explore available services and application [modules](./clanModules/index.md)
 - Discover [configuration options](./clan-core/index.md) that manage essential features
-- Find descriptions of the [Nix interfaces](./nix-api/index.md) for defining a Clan
+- Find descriptions of the [Nix interfaces](./nix-api/buildclan.md) for defining a Clan
 
 ---
 
diff --git a/docs/site/reference/nix-api/buildclan.md b/docs/site/reference/nix-api/buildclan.md
index 89a897c86..77ba9a66a 100644
--- a/docs/site/reference/nix-api/buildclan.md
+++ b/docs/site/reference/nix-api/buildclan.md
@@ -38,7 +38,7 @@ buildClan argument: `directory`
 ```nix
 "Root directory of the flake"
 ```
-        
+
 :simple-git: [interface.nix](https://git.clan.lol/clan/clan-core/src/branch/main/lib/build-clan/interface.nix)
 
 
@@ -86,7 +86,7 @@ A mapping of machine names to their nixos configuration.
 ```nix
 { }
 ```
-        
+
 :simple-git: [interface.nix](https://git.clan.lol/clan/clan-core/src/branch/main/lib/build-clan/interface.nix)
 
 
@@ -107,7 +107,7 @@ Global information about the clan.
 ```nix
 null
 ```
-        
+
 :simple-git: [interface.nix](https://git.clan.lol/clan/clan-core/src/branch/main/lib/build-clan/interface.nix)
 
 
@@ -145,7 +145,7 @@ This improves performance, but all nipxkgs.* options will be ignored.
 ```nix
 "Lambda :: String -> { ... } | null"
 ```
-        
+
 :simple-git: [interface.nix](https://git.clan.lol/clan/clan-core/src/branch/main/lib/build-clan/interface.nix)
 
 
@@ -165,6 +165,6 @@ Extra arguments to pass to nixosSystem i.e. useful to make self available
 ```nix
 { }
 ```
-        
+
 :simple-git: [interface.nix](https://git.clan.lol/clan/clan-core/src/branch/main/lib/build-clan/interface.nix)
 
diff --git a/lib/build-clan/interface.nix b/lib/build-clan/interface.nix
index 1a85c998c..16f56cf31 100644
--- a/lib/build-clan/interface.nix
+++ b/lib/build-clan/interface.nix
@@ -33,7 +33,7 @@ in
 
     # Optional
     machines = lib.mkOption {
-      type = types.deferredModule;
+      type = types.attrsOf types.deferredModule;
       default = { };
       description = ''
         A mapping of machine names to their nixos configuration.