diff --git a/ansible/inventory.yml b/ansible/inventory.yml
index 44721bf..6ae543a 100644
--- a/ansible/inventory.yml
+++ b/ansible/inventory.yml
@@ -4,11 +4,11 @@ all:
       - lauri
       - eaas
     extra_admins: []
+
   children:
     nasgroup:
       hosts:
-        nas.k-space.ee:
-          ansible_host: 172.23.0.7
+        nas.k-space.ee: { ansible_host: 172.23.0.7 }
         offsite:
           ansible_host: 78.28.64.17
           ansible_port: 10648
@@ -18,74 +18,52 @@ all:
       children:
         nasgroup:
       hosts:
-        ns1.k-space.ee:
-          ansible_host: 172.20.0.2
+        ns1.k-space.ee: { ansible_host: 172.20.0.2 }
+
     proxmox:
       vars:
         extra_admins:
           - rasmus
       hosts:
-        pve1:
-          ansible_host: 172.21.20.1
-        pve2:
-          ansible_host: 172.21.20.2
-        pve8:
-          ansible_host: 172.21.20.8
-        pve9:
-          ansible_host: 172.21.20.9
+        pve1: { ansible_host: 172.21.20.1 }
+        pve2: { ansible_host: 172.21.20.2 }
+        pve8: { ansible_host: 172.21.20.8 }
+        pve9: { ansible_host: 172.21.20.9 }
+
     kubernetes:
       children:
         masters:
           hosts:
-            master1.kube.k-space.ee:
-              ansible_host: 172.21.3.51
-            master2.kube.k-space.ee:
-              ansible_host: 172.21.3.52
-            master3.kube.k-space.ee:
-              ansible_host: 172.21.3.53
+            master1.kube.k-space.ee: { ansible_host: 172.21.3.51 }
+            master2.kube.k-space.ee: { ansible_host: 172.21.3.52 }
+            master3.kube.k-space.ee: { ansible_host: 172.21.3.53 }
         kubelets:
           children:
             mon:
               hosts:
-                mon1.kube.k-space.ee:
-                  ansible_host: 172.21.3.61
-                mon2.kube.k-space.ee:
-                  ansible_host: 172.21.3.62
-                mon3.kube.k-space.ee:
-                  ansible_host: 172.21.3.63
+                mon1.kube.k-space.ee: { ansible_host: 172.21.3.61 }
+                mon2.kube.k-space.ee: { ansible_host: 172.21.3.62 }
+                mon3.kube.k-space.ee: { ansible_host: 172.21.3.63 }
             storage:
               hosts:
-                storage1.kube.k-space.ee:
-                  ansible_host: 172.21.3.71
-                storage2.kube.k-space.ee:
-                  ansible_host: 172.21.3.72
-                storage3.kube.k-space.ee:
-                  ansible_host: 172.21.3.73
-                storage4.kube.k-space.ee:
-                  ansible_host: 172.21.3.74
+                storage1.kube.k-space.ee: { ansible_host: 172.21.3.71 }
+                storage2.kube.k-space.ee: { ansible_host: 172.21.3.72 }
+                storage3.kube.k-space.ee: { ansible_host: 172.21.3.73 }
+                storage4.kube.k-space.ee: { ansible_host: 172.21.3.74 }
             workers:
               hosts:
-                worker1.kube.k-space.ee:
-                  ansible_host: 172.20.3.81
-                worker2.kube.k-space.ee:
-                  ansible_host: 172.20.3.82
-                worker3.kube.k-space.ee:
-                  ansible_host: 172.20.3.83
-                worker4.kube.k-space.ee:
-                  ansible_host: 172.20.3.84
-                worker9.kube.k-space.ee:
-                  # Raspberry Pi 400
-                  ansible_host: 172.20.3.89
+                worker1.kube.k-space.ee: { ansible_host: 172.20.3.81 }
+                worker2.kube.k-space.ee: { ansible_host: 172.20.3.82 }
+                worker3.kube.k-space.ee: { ansible_host: 172.20.3.83 }
+                worker4.kube.k-space.ee: { ansible_host: 172.20.3.84 }
+                worker9.kube.k-space.ee: { ansible_host: 172.20.3.89 } # Raspberry Pi 400
+
     doors:
       vars:
         extra_admins:
           - arti
       hosts:
-        grounddoor:
-          ansible_host: 100.102.3.1
-        frontdoor:
-          ansible_host: 100.102.3.2
-        backdoor:
-          ansible_host: 100.102.3.3
-        workshopdoor:
-          ansible_host: 100.102.3.4
+        grounddoor: { ansible_host: 100.102.3.1 }
+        frontdoor: { ansible_host: 100.102.3.2 }
+        backdoor: { ansible_host: 100.102.3.3 }
+        workshopdoor: { ansible_host: 100.102.3.4 }