diff --git a/local.yml b/local.yml
index 9aea609..adb494a 100644
--- a/local.yml
+++ b/local.yml
@@ -38,77 +38,77 @@
 #   roles:
 #     - workstation
 
-- hosts: server
-  tags: server
+- hosts: servers
+  tags: servers
   become: true
   roles:
     - servers
 
-- hosts: nameserver
-  tags: server,nameserver
+- hosts: nameservers
+  tags: servers,nameservers
   become: true
   roles:
     - nameservers
 
-- hosts: webserver
-  tags: server,webserver
+- hosts: webservers
+  tags: servers,webservers
   become: true
   roles:
     - webservers
 
-# - hosts: mailserver
-#   tags: server,mailserver
+# - hosts: mailservers
+#   tags: servers,mailservers
 #   become: true
 #   roles:
 #     - mailservers
 
-- hosts: database
-  tags: server,database
+- hosts: databases
+  tags: servers,databases
   become: true
   roles:
     - databases
 
-# - hosts: dhcpserver
-#   tags: server,dhcpserver
+# - hosts: dhcpservers
+#   tags: servers,dhcpservers
 #   become: true
 #   roles:
 #     - dhcpservers
 
 - hosts: docker
-  tags: server,docker
+  tags: servers,docker
   become: true
   roles:
     - docker
 
-# - hosts: fileserver
-#   tags: server,fileserver
+# - hosts: fileservers
+#   tags: servers,fileservers
 #   become: true
 #   roles:
 #     - fileserver
 
 - hosts: mastodon
-  tags: server,mastodon
+  tags: servers,mastodon
   become: true
   roles:
     - mastodon
 
-# - hosts: printspooler
-#   tags: server,printspooler
+# - hosts: printspoolers
+#   tags: servers,printspoolers
 #   become: true
 #   roles:
 #     - printspooler
 
 - hosts: jitsimeet
-  tags: server,jitsimeet,webserver
+  tags: servers,jitsimeet,webservers
   become: true
   roles:
     - jitsimeet
 
-# - hosts: proxyserver
-#   tags: server,proxyserver
+# - hosts: proxyservers
+#   tags: servers,proxyservers
 #   become: true
 #   roles:
-#     - proxyserver
+#     - proxyservers
 
 # end of roles; cleanup and reporting
 - hosts: all