diff --git a/ansible/host_vars/lab.yaml b/ansible/host_vars/lab.yaml
index 00a280e..f45dca3 100644
--- a/ansible/host_vars/lab.yaml
+++ b/ansible/host_vars/lab.yaml
@@ -1,8 +1,10 @@
 ---
 
-# common
+# connection
 
+ansible_user: ladmin
 ansible_become_user: ladmin
+ansible_os_family: Arch
 
 # sshd
 
diff --git a/ansible/inventory/hosts.yaml b/ansible/inventory/hosts.yaml
index 5138b71..6905517 100644
--- a/ansible/inventory/hosts.yaml
+++ b/ansible/inventory/hosts.yaml
@@ -1,27 +1,28 @@
 all:
   children:
-    hosts:
-      server:
-        ansible_host: server.balsillie.net
-        ansible_os_family: Arch
-      lab:
-        ansible_host: lab.balsillie.net
-        ansible_os_family: Arch
-        ansible_user: ladmin
+    hypervisors:
+      hosts:
+        server:
+          ansible_host: server.balsillie.net
+        lab:
+          ansible_host: lab.balsillie.net
     nodes:
-      node1:
-        ansible_host: node1.balsillie.net
-      node2:
-        ansible_host: node2.balsillie.net
-      node3:
-        ansible_host: node3.balsillie.net
+      hosts:
+        node1:
+          ansible_host: node1.balsillie.net
+        node2:
+          ansible_host: node2.balsillie.net
+        node3:
+          ansible_host: node3.balsillie.net
     guests:
-      router:
-        ansible_host: router.balsillie.net
+      hosts:
+        router:
+          ansible_host: router.balsillie.net
     workstations:
-      lat5420:
-        ansible_host: lat5420.balsillie.net
-      sff:
-        ansible_host: sff.balsillie.net
-      bridie:
-        ansible_host: bridie.balsillie.net
\ No newline at end of file
+      hosts:
+        lat5420:
+          ansible_host: lat5420.balsillie.net
+        sff:
+          ansible_host: sff.balsillie.net
+        bridie:
+          ansible_host: bridie.balsillie.net
\ No newline at end of file