diff --git a/production.yml b/production.yml
index 9ca8e4d..ee9d783 100644
--- a/production.yml
+++ b/production.yml
@@ -9,24 +9,24 @@ hypervisors:
 
 resticservers:
   hosts:
-    muse-HP-EliteBook-820-G2.home.arpa:
     baybay-ponay.mateu.be:
-    pinkypie.home.arpa:
     bt.dmz.mateu.be:
-    web[1:3].dmz.mateu.be:
     es1.dmz.mateu.be:
-    pt1.dmz.mateu.be:
-    mail.dmz.mateu.be:
-    jabber.dmz.mateu.be:
-    voice1.dmz.mateu.be:
-    masto1.dmz.mateu.be:
-    garage1.dmz.mateu.be:
     frederica.dmz.mateu.be:
+    garage1.dmz.mateu.be:
+    jabber.dmz.mateu.be:
+    mail.dmz.mateu.be:
+    masto1.dmz.mateu.be:
+    muse-HP-EliteBook-820-G2.home.arpa:
+    pinkypie.home.arpa:
+    pt1.dmz.mateu.be:
+    voice1.dmz.mateu.be:
+    web[1:3].dmz.mateu.be:
 
 nsdservers:
   hosts:
-    nsd-master1.ext.mateu.be:
     dns1.dmz.mateu.be:
+    nsd-master1.ext.mateu.be:
 
 garageservers:
   children:
@@ -40,30 +40,26 @@ elasticsearchservers:
 
 nut:
   children:
-    nut_server:
     nut_client:
-
-nut_server:
-  hosts:
-    serenor.dmz.mateu.be:
-
-nut_client:
-  hosts:
-    serenor.dmz.mateu.be:
+      hosts:
+        serenor.dmz.mateu.be:
+    nut_server:
+      hosts:
+        serenor.dmz.mateu.be:
 
 webservers:
   hosts:
     bt.dmz.mateu.be:
     garage1.dmz.mateu.be:
+    jabber.dmz.mateu.be:
+    mail.dmz.mateu.be:
+    masto1.dmz.mateu.be:
+    pt1.dmz.mateu.be:
+    voice3.dmz.mateu.be:
+    munin.dmz.mateu.be:
     web1.dmz.mateu.be:
     web2.dmz.mateu.be:
     web3.dmz.mateu.be:
-    masto1.dmz.mateu.be:
-    jabber.dmz.mateu.be:
-    voice3.dmz.mateu.be:
-    mail.dmz.mateu.be:
-    munin.dmz.mateu.be:
-    pt1.dmz.mateu.be:
 
 peertubeservers:
   hosts:
@@ -83,8 +79,8 @@ mariadbservers:
 
 pgsqlservers:
   hosts:
-    pt1.dmz.mateu.be:
     masto1.dmz.mateu.be:
+    pt1.dmz.mateu.be:
     web1.dmz.mateu.be:
 
 mastodonservers:
@@ -133,20 +129,20 @@ disabled_loadbalanced_webservers:
 disabled_munin:
   hosts:
     baybay-ponay.mateu.be:
-    muse-HP-EliteBook-820-G2.home.arpa:
-    pinkypie.home.arpa:
     frederica.dmz.mateu.be:
+    muse-HP-EliteBook-820-G2.home.arpa:
     nsd-master1.ext.mateu.be:
+    pinkypie.home.arpa:
     pt-runner1.ext.mateu.be:
 
 disabled_syslog:
   hosts:
     baybay-ponay.mateu.be:
+    frederica.dmz.mateu.be:
     machinbox.mateu.be:
     muse-HP-EliteBook-820-G2.home.arpa:
-    pinkypie.home.arpa:
-    frederica.dmz.mateu.be:
     nsd-master1.ext.mateu.be:
+    pinkypie.home.arpa:
     pt-runner1.ext.mateu.be:
 
 # Those are not servers and should not be configured as such