diff --git a/devel-hosts.yml b/devel-hosts.yml
new file mode 100644
index 0000000..3ea3275
--- /dev/null
+++ b/devel-hosts.yml
@@ -0,0 +1,8 @@
+# ansible-playbook -i devel-hosts.yml playbooks/devel.yml
+---
+devel:
+  hosts:
+    devel01.home.foo.sh:
+rocky8:
+  children:
+    devel:
diff --git a/hosts b/hosts
deleted file mode 100644
index 766b236..0000000
--- a/hosts
+++ /dev/null
@@ -1,151 +0,0 @@
-[adm]
-adm01.home.foo.sh
-adm02.home.foo.sh
-
-[backup]
-backup02.home.foo.sh
-
-[collab]
-collab01.home.foo.sh
-
-[dnagw]
-dna-gw01.home.foo.sh
-dna-gw02.home.foo.sh
-
-[fsolgw]
-fsol-gw01.home.foo.sh
-fsol-gw02.home.foo.sh
-
-[git]
-git02.home.foo.sh
-
-[influxdb]
-influxdb02.home.foo.sh
-
-[jenkins]
-jenkins01.home.foo.sh
-
-[ldap]
-ldap01.home.foo.sh
-ldap02.home.foo.sh
-
-[log]
-log01.home.foo.sh
-
-[mail]
-mail02.home.foo.sh
-
-[minecraft]
-minecraft01.home.foo.sh
-
-[mirror]
-mirror01.home.foo.sh
-
-[mongodb]
-mongodb01.home.foo.sh
-
-[munin]
-munin01.home.foo.sh
-
-[nas]
-nas02.home.foo.sh
-
-[nms]
-nms01.home.foo.sh
-nms02.home.foo.sh
-
-[ns]
-ns01.home.foo.sh
-ns02.home.foo.sh
-atl01.vultr.foo.sh
-
-[ocinode]
-oci-node01.home.foo.sh
-oci-node02.home.foo.sh
-
-[print]
-print01.home.foo.sh
-
-[proxy]
-proxy01.home.foo.sh
-proxy02.home.foo.sh
-
-[relay]
-relay01.home.foo.sh
-relay02.home.foo.sh
-
-[shell]
-shell01.foo.sh
-shell02.foo.sh
-
-[sqldb]
-sqldb02.home.foo.sh
-
-[static]
-static01.home.foo.sh
-static02.home.foo.sh
-
-[vmhost]
-vmhost01.home.foo.sh
-vmhost02.home.foo.sh
-
-[zm]
-zm02.home.foo.sh
-
-[vultr]
-atl01.vultr.foo.sh
-
-[sftpbackup:children]
-collab
-ldap
-sqldb
-
-[webservers:children]
-adm
-collab
-git
-jenkins
-ldap
-mirror
-munin
-ns
-proxy
-relay
-shell
-static
-zm
-
-[fedora:children]
-
-[openbsd:children]
-backup
-dnagw
-fsolgw
-log
-ns
-proxy
-relay
-
-[rocky8:children]
-adm
-collab
-git
-influxdb
-jenkins
-ldap
-mail
-minecraft
-mirror
-mongodb
-munin
-nas
-nms
-ocinode
-print
-shell
-sqldb
-static
-vmhost
-zm
-
-[rocky9:children]
diff --git a/hosts.devel b/hosts.devel
deleted file mode 100644
index db830f0..0000000
--- a/hosts.devel
+++ /dev/null
@@ -1,7 +0,0 @@
-# ansible-playbook -i hosts.devel playbooks/devel.yml
-
-[devel]
-devel01.home.foo.sh
-
-[rocky8:children]
-devel
diff --git a/hosts.yml b/hosts.yml
new file mode 100644
index 0000000..9e5b97e
--- /dev/null
+++ b/hosts.yml
@@ -0,0 +1,147 @@
+---
+adm:
+  hosts:
+    adm01.home.foo.sh:
+    adm02.home.foo.sh:
+backup:
+  hosts:
+    backup02.home.foo.sh:
+collab:
+  hosts:
+    collab01.home.foo.sh:
+dnagw:
+  hosts:
+    dna-gw01.home.foo.sh:
+    dna-gw02.home.foo.sh:
+fsolgw:
+  hosts:
+    fsol-gw01.home.foo.sh:
+    fsol-gw02.home.foo.sh:
+git:
+  hosts:
+    git02.home.foo.sh:
+influxdb:
+  hosts:
+    influxdb02.home.foo.sh:
+jenkins:
+  hosts:
+    jenkins01.home.foo.sh:
+ldap:
+  hosts:
+    ldap01.home.foo.sh:
+    ldap02.home.foo.sh:
+log:
+  hosts:
+    log01.home.foo.sh:
+mail:
+  hosts:
+    mail02.home.foo.sh:
+minecraft:
+  hosts:
+    minecraft01.home.foo.sh:
+mirror:
+  hosts:
+    mirror01.home.foo.sh:
+munin:
+  hosts:
+    munin01.home.foo.sh:
+nas:
+  hosts:
+    nas02.home.foo.sh:
+nms:
+  hosts:
+    nms01.home.foo.sh:
+    nms02.home.foo.sh:
+ns:
+  hosts:
+    ns01.home.foo.sh:
+    ns02.home.foo.sh:
+    atl01.vultr.foo.sh:
+ocinode:
+  hosts:
+    oci-node01.home.foo.sh:
+    oci-node02.home.foo.sh:
+print:
+  hosts:
+    print01.home.foo.sh:
+proxy:
+  hosts:
+    proxy01.home.foo.sh:
+    proxy02.home.foo.sh:
+relay:
+  hosts:
+    relay01.home.foo.sh:
+    relay02.home.foo.sh:
+shell:
+  hosts:
+    shell01.home.foo.sh:
+    shell02.home.foo.sh:
+sqldb:
+  hosts:
+    sqldb02.home.foo.sh:
+static:
+  hosts:
+    static01.home.foo.sh:
+    static02.home.foo.sh:
+vmhost:
+  hosts:
+    vmhost01.home.foo.sh:
+    vmhost02.home.foo.sh:
+zm:
+  hosts:
+    zm02.home.foo.sh:
+
+sftpbackup:
+  children:
+    collab:
+    ldap:
+    sqldb:
+webservers:
+  children:
+    adm:
+    collab:
+    git:
+    jenkins:
+    ldap:
+    mirror:
+    munin:
+    ns:
+    proxy:
+    relay:
+    shell:
+    static:
+    zm:
+
+fedora:
+  children:
+openbsd:
+  children:
+    backup:
+    dnagw:
+    fsolgw:
+    log:
+    ns:
+    proxy:
+    relay:
+rocky8:
+  children:
+    adm:
+    collab:
+    git:
+    influxdb:
+    jenkins:
+    ldap:
+    mirror:
+    mongodb:
+    munin:
+    nas:
+    nms:
+    ocinode:
+    print:
+    shell:
+    sqldb:
+    static:
+    vmhost:
+    zm:
+rocky9:
+  children: