diff --git a/inventory b/inventory
index b05515f..ba86225 100644
--- a/inventory
+++ b/inventory
@@ -1,21 +1,53 @@
-; -*-conf-windows-*-
+# -*-yaml-*-
+local:
+  hosts:
+    localhost:
+  vars:
+    ansible_connection: local
 
-[local]
-localhost ansible_connection=local
+containers:
+  hosts:
+    "peoples-home.servers.ezri.dev":
+      ansible_port: 2231
+      # ansible_become: no
+      # ansible_user: root
+    tynan.servers.ezri.dev:
+      ansible_become: no
+      ansible_user: root
+    dewalt.servers.ezri.dev:
+      ansible_become: no
+      ansible_user: root
+    pathfinder.servers.ezri.dev:
+      ansible_become: no
+      ansible_user: root
+    sojourner.servers.ezri.dev:
+      ansible_become: no
+      ansible_user: root
+    atlantis.servers.ezri.dev:
+      ansible_become: no
+      ansible_user: root
+  vars:
+    ansible_become: yes
+    ansible_user: localadmin
 
-[container_runners]
-horizon.servers.ezri.dev
+unifi:
+  hosts:
+    atlantis.servers.ezri.dev:
 
-[kanidm_native]
-normandy.network.ezri.dev
-tycho.vpn.ezri.dev
-rocinante.vpn.ezri.dev
-serenity.wlan.ezri.dev
+desktops:
+  hosts:
+    normandy.network.ezri.dev:
+    serenity.wlan.ezri.dev:
+    rocinante.vpn.ezri.dev:
+  vars:
+    ansible_become: yes
 
-[desktop]
-;normandy ansible_connection=ssh ansible_become=true
-serenity ansible_connection=ssh ansible_become=true
-
-[nginx]
-peoples-home.servers.ezri.dev ansible_connection=ssh ansible_port=2231 ansible_user=root
+sysadmin_exercise:
+  hosts:
+    phoenix.servers.ezri.dev:
+      ansible_become: yes
 
+nginx:
+  hosts:
+    peoples-home.servers.ezri.dev:
+