diff --git a/hosts b/hosts
index da53cd9..f5f1d4d 100644
--- a/hosts
+++ b/hosts
@@ -4,29 +4,29 @@ VM-debian11-template
 [cluster:children]
 glustertest
 
-[server]
+[servers]
 pve
 netbox
 Samba-AD-DC
 librenms
 grafana
 
-[server:children]
+[servers:children]
 cluster
-database
-dhcpserver
+databases
+dhcpservers
 docker
-fileserver
+fileservers
 icinga
 jitsimeet
-mailserver
+mailservers
 mastodon
-nameserver
-printspooler
-proxyserver
-webserver
+nameservers
+printspoolers
+proxyservers
+webservers
 
-[database]
+[databases]
 coruscant.universe.local
 mariadb01
 mariadb02
@@ -37,7 +37,7 @@ endor.universe.local
 endorvm.universe.local
 tuxedo-book-xp1511.universe.local
 
-[dhcpserver]
+[dhcpservers]
 coruscant.universe.local
 dhcp-kea
 
@@ -45,7 +45,7 @@ dhcp-kea
 docker01
 docker02
 
-[fileserver]
+[fileservers]
 coruscant.universe.local
 
 [glustertest]
@@ -62,7 +62,7 @@ icinga-master
 [jitsimeet]
 mewimeet.de jitsi_fqdn=mewimeet.de
 
-[mailserver]
+[mailservers]
 coruscant.universe.local
 mail.mewissen.site
 
@@ -73,7 +73,7 @@ ubuntu-test
 [mobile]
 tuxedo-book-xp1511.universe.local
 
-[nameserver]
+[nameservers]
 coruscant.universe.local
 mewimeet.de
 mewitoot.de
@@ -86,10 +86,10 @@ endor.universe.local
 endorvm.universe.local
 tuxedo-book-xp1511.universe.local
 
-[printspooler]
+[printspoolers]
 coruscant.universe.local
 
-[proxyserver]
+[proxyservers]
 coruscant.universe.local
 
 [video_editing]
@@ -97,12 +97,12 @@ endor.universe.local
 endorvm.universe.local
 tuxedo-book-xp1511.universe.local
 
-[webserver]
+[webservers]
 coruscant.universe.local
 nextcloud
 webserver
 
-[workstation:children]
+[workstations:children]
 development
 mobile
 photo_editing
diff --git a/local.yml b/local.yml
index 83ab497..9aea609 100644
--- a/local.yml
+++ b/local.yml
@@ -42,37 +42,37 @@
   tags: server
   become: true
   roles:
-    - server
+    - servers
 
 - hosts: nameserver
   tags: server,nameserver
   become: true
   roles:
-    - nameserver
+    - nameservers
 
 - hosts: webserver
   tags: server,webserver
   become: true
   roles:
-    - webserver
+    - webservers
 
 # - hosts: mailserver
 #   tags: server,mailserver
 #   become: true
 #   roles:
-#     - mailserver
+#     - mailservers
 
-# - hosts: database
-#   tags: server,database
-#   become: true
-#   roles:
-#     - database
+- hosts: database
+  tags: server,database
+  become: true
+  roles:
+    - databases
 
 # - hosts: dhcpserver
 #   tags: server,dhcpserver
 #   become: true
 #   roles:
-#     - dhcpserver
+#     - dhcpservers
 
 - hosts: docker
   tags: server,docker