diff --git a/inventory/lab.yml b/inventory/lab.yml
index 7924271..64d7120 100644
--- a/inventory/lab.yml
+++ b/inventory/lab.yml
@@ -1,82 +1,96 @@
 all:
-    hosts:
+  hosts:
+    hb-wide-1:
+      ansible_host: 192.168.56.101
+      is_nas: false
+      hostname: hb-wide-1
+      wireguard_ip: 10.20.0.1
+      k3s_label:
+        - type=worker
+        - size=wide
+      headscale:
+        network: beta
+    hb-wide-2:
+      ansible_host: 192.168.56.102
+      is_nas: false
+      hostname: hb-wide-2
+      wireguard_ip: 10.20.0.2
+      k3s_label:
+        - type=worker
+        - size=wide
+      headscale:
+        network: beta
+    hb-slim-1:
+      ansible_host: 192.168.56.11
+      is_nas: false
+      hostname: hb-slim-1
+      wireguard_ip: 10.20.0.11
+      k3s_label:
+        - type=worker
+        - size=slim
+      headscale:
+        network: beta
+    hb-slim-2:
+      ansible_host: 192.168.56.12
+      is_nas: false
+      hostname: hb-slim-2
+      wireguard_ip: 10.20.0.12
+      k3s_label:
+        - type=worker
+        - size=slim
+      headscale:
+        network: beta
+    hb-slim-3:
+      ansible_host: 192.168.56.13
+      is_nas: false
+      hostname: hb-slim-3
+      wireguard_ip: 10.20.0.13
+      k3s_label:
+        - type=worker
+        - size=slim
+      headscale:
+        network: beta
+    nas:
+      ansible_host: 192.168.56.200
+      is_nas: true
+      hostname: nas
+      wireguard_ip: 10.20.0.100
+      headscale:
+        network: beta
+  children:
+    master:
+      hosts:
         hb-wide-1:
-            ansible_host: 192.168.56.101
-            is_nas: false
-            hostname: hb-wide-1
-            wireguard_ip: 10.20.0.1
-            k3s_label:
-              - type=worker
-              - size=wide
-            headscale:
-              network: beta
+    node:
+      hosts:
         hb-wide-2:
-            ansible_host: 192.168.56.102
-            is_nas: false
-            hostname: hb-wide-2
-            wireguard_ip: 10.20.0.2
-            k3s_label:
-              - type=worker
-              - size=wide
         hb-slim-1:
-            ansible_host: 192.168.56.11
-            is_nas: false
-            hostname: hb-slim-1
-            wireguard_ip: 10.20.0.11
-            k3s_label:
-              - type=worker
-              - size=slim
         hb-slim-2:
-            ansible_host: 192.168.56.12
-            is_nas: false
-            hostname: hb-slim-2
-            wireguard_ip: 10.20.0.12
-            k3s_label:
-              - type=worker
-              - size=slim
         hb-slim-3:
-            ansible_host: 192.168.56.13
-            is_nas: false
-            hostname: hb-slim-3
-            wireguard_ip: 10.20.0.13
-            k3s_label:
-              - type=worker
-              - size=slim
-        nas:
-            ansible_host: 192.168.56.200
-            is_nas: true
-            hostname: nas
-            wireguard_ip: 10.20.0.100
-    children:
-        master:
-            hosts:
-                hb-wide-1:
-        node:
-            hosts:
-                hb-wide-2:
-                hb-slim-1:
-                hb-slim-2:
-                hb-slim-3:
-        etcd_cluster:
-            hosts:
-                hb-wide-1:
-                hb-wide-2:
-                hb-slim-1:
-                hb-slim-2:
-                hb-slim-3:
-        k3s_cluster:
-            children:
-                master:
-                node:
-        headscale_client:
-            hosts:
-              hb-wide-1:
-              hb-wide-2:
-    vars:
-        ansible_ssh_private_key_file: ~/.ssh/creator
-        ansible_user: creator
-        ansible_become_password: aberation
-        ansible_ssh_port: 22
-        ufw_enabled: false
-        wireguard_port: 51820
-        wireguard_mask_bits: 8
+    etcd_cluster:
+      hosts:
+        hb-wide-1:
+        hb-wide-2:
+        hb-slim-1:
+        hb-slim-2:
+        hb-slim-3:
+    k3s_cluster:
+      children:
+        server:
+        agent:
+    headscale_client:
+      hosts:
+      hb-wide-1:
+      hb-wide-2:
+      hb-slim-1:
+      hb-slim-2:
+      hb-slim-3:
+      nas:
+  vars:
+    ansible_ssh_private_key_file: ~/.ssh/creator
+    ansible_user: creator
+    ansible_become_password: aberation
+    ansible_ssh_port: 22
+    ufw_enabled: false
+    wireguard_port: 51820
+    wireguard_mask_bits: 8