diff --git a/hosts b/hosts
index 69392e7..0ba03f3 100644
--- a/hosts
+++ b/hosts
@@ -147,7 +147,7 @@ endor.universe.local
 endorvm.universe.local
 tuxedo-book-xp1511.universe.local
 
-[webserver]
+[webservers]
 nextcloud.universe.local
 searx.universe.local
 webserver.universe.local
diff --git a/local.yml b/local.yml
index 3b03118..53b5eeb 100644
--- a/local.yml
+++ b/local.yml
@@ -58,11 +58,11 @@
   roles:
     - nameserver
 
-- hosts: webserver
-  tags: server,webserver
+- hosts: webservers
+  tags: server,webservers
   become: true
   roles:
-    - webserver
+    - webservers
 
 - hosts: mailserver
   tags: server,mailserver
diff --git a/roles/webserver/files/nginx_localhost b/roles/webservers/files/nginx_localhost
similarity index 100%
rename from roles/webserver/files/nginx_localhost
rename to roles/webservers/files/nginx_localhost
diff --git a/roles/webserver/handlers/main.yml b/roles/webservers/handlers/main.yml
similarity index 100%
rename from roles/webserver/handlers/main.yml
rename to roles/webservers/handlers/main.yml
diff --git a/roles/webserver/tasks/apps/apps.yml b/roles/webservers/tasks/apps/apps.yml
similarity index 100%
rename from roles/webserver/tasks/apps/apps.yml
rename to roles/webservers/tasks/apps/apps.yml
diff --git a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml b/roles/webservers/tasks/apps/nextcloud/nextcloud.yml
similarity index 100%
rename from roles/webserver/tasks/apps/nextcloud/nextcloud.yml
rename to roles/webservers/tasks/apps/nextcloud/nextcloud.yml
diff --git a/roles/webserver/tasks/apps/nextcloud/prereq.yml b/roles/webservers/tasks/apps/nextcloud/prereq.yml
similarity index 100%
rename from roles/webserver/tasks/apps/nextcloud/prereq.yml
rename to roles/webservers/tasks/apps/nextcloud/prereq.yml
diff --git a/roles/webserver/tasks/configure_apache_snmpd.yml b/roles/webservers/tasks/configure_apache_snmpd.yml
similarity index 100%
rename from roles/webserver/tasks/configure_apache_snmpd.yml
rename to roles/webservers/tasks/configure_apache_snmpd.yml
diff --git a/roles/webserver/tasks/configure_nginx_snmpd.yml b/roles/webservers/tasks/configure_nginx_snmpd.yml
similarity index 100%
rename from roles/webserver/tasks/configure_nginx_snmpd.yml
rename to roles/webservers/tasks/configure_nginx_snmpd.yml
diff --git a/roles/webserver/tasks/install_apache.yml b/roles/webservers/tasks/install_apache.yml
similarity index 100%
rename from roles/webserver/tasks/install_apache.yml
rename to roles/webservers/tasks/install_apache.yml
diff --git a/roles/webserver/tasks/install_nginx.yml b/roles/webservers/tasks/install_nginx.yml
similarity index 100%
rename from roles/webserver/tasks/install_nginx.yml
rename to roles/webservers/tasks/install_nginx.yml
diff --git a/roles/webserver/tasks/install_php.yml b/roles/webservers/tasks/install_php.yml
similarity index 100%
rename from roles/webserver/tasks/install_php.yml
rename to roles/webservers/tasks/install_php.yml
diff --git a/roles/webserver/tasks/main.yml b/roles/webservers/tasks/main.yml
similarity index 100%
rename from roles/webserver/tasks/main.yml
rename to roles/webservers/tasks/main.yml
diff --git a/roles/webserver/templates/nextcloud/config.php.j2 b/roles/webservers/templates/nextcloud/config.php.j2
similarity index 100%
rename from roles/webserver/templates/nextcloud/config.php.j2
rename to roles/webservers/templates/nextcloud/config.php.j2
diff --git a/roles/webserver/vars/debian.yml b/roles/webservers/vars/debian.yml
similarity index 100%
rename from roles/webserver/vars/debian.yml
rename to roles/webservers/vars/debian.yml
diff --git a/roles/webserver/vars/nextcloud.yml b/roles/webservers/vars/nextcloud.yml
similarity index 100%
rename from roles/webserver/vars/nextcloud.yml
rename to roles/webservers/vars/nextcloud.yml
diff --git a/roles/webserver/vars/ubuntu.yml b/roles/webservers/vars/ubuntu.yml
similarity index 100%
rename from roles/webserver/vars/ubuntu.yml
rename to roles/webservers/vars/ubuntu.yml