diff --git a/hosts b/hosts
index 4e53a0a..bde15da 100644
--- a/hosts
+++ b/hosts
@@ -148,7 +148,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 0b8a6cf..263c27f 100644
--- a/local.yml
+++ b/local.yml
@@ -92,11 +92,11 @@
   roles:
     - nameserver
 
-- hosts: webserver
-  tags: server,webserver
+- hosts: webservers
+  tags: server,webservers
   become: true
   roles:
-    - webserver
+    - webservers
 
 - hosts: mailserver
   tags: server,mailserver
@@ -147,7 +147,7 @@
 #     - printspooler
 
 - hosts: jitsimeet
-  tags: server,jitsimeet,webserver
+  tags: server,jitsimeet,webservers
   become: true
   roles:
     - jitsimeet
diff --git a/roles/jitsimeet/tasks/main.yml b/roles/jitsimeet/tasks/main.yml
index ea682f6..00b6f27 100644
--- a/roles/jitsimeet/tasks/main.yml
+++ b/roles/jitsimeet/tasks/main.yml
@@ -6,9 +6,9 @@
   - debug:
       msg: Debug
 
-  # import role webserver
+  # import role webservers
   - include_role:
-      name: webserver
+      name: webservers
 
   # install software
   - include_tasks: prepare_system.yml
diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml
index ab6d4b2..ce091e3 100644
--- a/roles/mastodon/tasks/main.yml
+++ b/roles/mastodon/tasks/main.yml
@@ -12,7 +12,7 @@
   - include_role: name=database
   - include_tasks: system_setup/prepare_database.yml
   - include_tasks: system_setup/packages.yml
-  - include_role: name=webserver
+  - include_role: name=webservers
   - include_tasks: system_setup/nginx.yml
   - include_tasks: system_setup/user.yml
   - include_tasks: system_setup/ruby.yml
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 72%
rename from roles/webserver/tasks/apps/nextcloud/nextcloud.yml
rename to roles/webservers/tasks/apps/nextcloud/nextcloud.yml
index f954ee6..d9d4638 100644
--- a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml
+++ b/roles/webservers/tasks/apps/nextcloud/nextcloud.yml
@@ -1,20 +1,20 @@
 - include_vars: nextcloud.yml
 - import_tasks: apps/nextcloud/prereq.yml
 
-- name: webserver | nextcloud | get tar ball
+- name: webservers | nextcloud | get tar ball
   uri:
     url: "https://download.nextcloud.com/server/releases/latest.zip"
     dest: "/tmp/nextcloud_latest.zip"
     follow_redirects: all
 
-- name: webserver | nextcloud | extract archive
+- name: webservers | nextcloud | extract archive
   unarchive:
     src: "/tmp/nextcloud_latest.zip"
     dest: "/var/www/"
     owner: "{{ webuser }}"
     group: "{{ webuser }}"
 
-- name: webserver | nextcloud | remove temporary file
+- name: webservers | nextcloud | remove temporary file
   file:
     path: "/tmp/nextcloud_latest.zip"
     state: absent
\ No newline at end of file
diff --git a/roles/webserver/tasks/apps/nextcloud/prereq.yml b/roles/webservers/tasks/apps/nextcloud/prereq.yml
similarity index 75%
rename from roles/webserver/tasks/apps/nextcloud/prereq.yml
rename to roles/webservers/tasks/apps/nextcloud/prereq.yml
index b2990d9..3930e9b 100644
--- a/roles/webserver/tasks/apps/nextcloud/prereq.yml
+++ b/roles/webservers/tasks/apps/nextcloud/prereq.yml
@@ -1,4 +1,4 @@
-- name: webserver | nextcloud | basic tools
+- name: webservers | nextcloud | basic tools
   package:
     state: latest
     name:
@@ -9,19 +9,19 @@
       - ca-certificates
   when: ansible_distribution in ["Debian", "Ubuntu", "Linux Mint"]
 
-- name: webserver | nextcloud | prereq | get php repo key
+- name: webservers | nextcloud | prereq | get php repo key
   uri:
     url: "https://packages.sury.org/php/apt.gpg"
     dest: "/etc/apt/trusted.gpg.d/php.gpg"
 
-- name: webserver | nextcloud | prereq | add php repo
+- name: webservers | nextcloud | prereq | add php repo
   lineinfile:
     path: "/etc/apt/sources.list.d/php.list"
     state: present
     line: "deb https://packages.sury.org/php/ {{ ansible_distribution_release | lower }} main"
     create: True
   
-- name: webserver | nextcloud | prereq | install php
+- name: webservers | nextcloud | prereq | install php
   package:
     state: latest
     name: "{{ item.package }}"
diff --git a/roles/webserver/tasks/configure_apache_snmpd.yml b/roles/webservers/tasks/configure_apache_snmpd.yml
similarity index 74%
rename from roles/webserver/tasks/configure_apache_snmpd.yml
rename to roles/webservers/tasks/configure_apache_snmpd.yml
index 0f20bee..2da4843 100644
--- a/roles/webserver/tasks/configure_apache_snmpd.yml
+++ b/roles/webservers/tasks/configure_apache_snmpd.yml
@@ -1,15 +1,15 @@
-- name: webserver | snmpd | create cache directory
+- name: webservers | snmpd | create cache directory
   file:
     path: "/var/cache/librenms/"
     state: directory
     owner: "{{ snmpduser | default('root') }}"
 
-- name: webserver | snmpd | install requirement
+- name: webservers | snmpd | install requirement
   package:
     name: "python3-urllib3"
     state: latest
 
-- name: webserver | snmpd | get script
+- name: webservers | snmpd | get script
   get_url:
     url: "https://raw.githubusercontent.com/librenms/librenms-agent/master/snmp/apache-stats.py"
     dest: "/etc/snmp/apache-stats.py"
@@ -17,7 +17,7 @@
     owner: "root"
     group: "root"
 
-- name: webserver | snmpd | configure extend
+- name: webservers | snmpd | configure extend
   lineinfile:
     path: "{{ snmpd_conf }}"
     state: present
diff --git a/roles/webserver/tasks/configure_nginx_snmpd.yml b/roles/webservers/tasks/configure_nginx_snmpd.yml
similarity index 80%
rename from roles/webserver/tasks/configure_nginx_snmpd.yml
rename to roles/webservers/tasks/configure_nginx_snmpd.yml
index 7a15834..693ce60 100644
--- a/roles/webserver/tasks/configure_nginx_snmpd.yml
+++ b/roles/webservers/tasks/configure_nginx_snmpd.yml
@@ -1,4 +1,4 @@
-- name: webserver | snmpd | get script
+- name: webservers | snmpd | get script
   get_url:
     url: "https://raw.githubusercontent.com/librenms/librenms-agent/master/snmp/nginx"
     dest: "/etc/snmp/nginx"
@@ -6,7 +6,7 @@
     owner: "root"
     group: "root"
 
-- name: webserver | snmpd | configure extend
+- name: webservers | snmpd | configure extend
   lineinfile:
     path: "{{ snmpd_conf }}"
     state: present
diff --git a/roles/webserver/tasks/install_apache.yml b/roles/webservers/tasks/install_apache.yml
similarity index 66%
rename from roles/webserver/tasks/install_apache.yml
rename to roles/webservers/tasks/install_apache.yml
index 4b3824b..308819c 100644
--- a/roles/webserver/tasks/install_apache.yml
+++ b/roles/webservers/tasks/install_apache.yml
@@ -1,9 +1,9 @@
-- name: webserver | apache | installing apache
+- name: webservers | apache | installing apache
   package:
     name: "{{ apache_package }}"
     state: latest
 
-- name: webserver | apache | setup server-statistics
+- name: webservers | apache | setup server-statistics
   command:
     cmd: 'a2enmod status'
     creates: '/etc/apache2/mods-enabled/status.conf'
diff --git a/roles/webserver/tasks/install_nginx.yml b/roles/webservers/tasks/install_nginx.yml
similarity index 64%
rename from roles/webserver/tasks/install_nginx.yml
rename to roles/webservers/tasks/install_nginx.yml
index 471edcd..8ce7963 100644
--- a/roles/webserver/tasks/install_nginx.yml
+++ b/roles/webservers/tasks/install_nginx.yml
@@ -1,14 +1,14 @@
-- name: webserver | nginx | installing nginx
+- name: webservers | nginx | installing nginx
   package:
     name: "{{ nginx_package }}"
     state: latest
 
-- name: webserver | nginx | setup localhost for statistics
+- name: webservers | nginx | setup localhost for statistics
   copy:
     src: "nginx_localhost"
     dest: "/etc/nginx/sites-available/localhost"
 
-- name: webserver | nginx | link sites-available to sites-enabled for localhost
+- name: webservers | nginx | link sites-available to sites-enabled for localhost
   file:
     path: "/etc/nginx/sites-enabled/localhost"
     state: link
diff --git a/roles/webserver/tasks/install_php.yml b/roles/webservers/tasks/install_php.yml
similarity index 60%
rename from roles/webserver/tasks/install_php.yml
rename to roles/webservers/tasks/install_php.yml
index 4660418..cdc8e31 100644
--- a/roles/webserver/tasks/install_php.yml
+++ b/roles/webservers/tasks/install_php.yml
@@ -1,4 +1,4 @@
-- name: webserver | apache | installing php
+- name: webservers | apache | installing php
   package:
     name:
       - php
diff --git a/roles/webserver/tasks/main.yml b/roles/webservers/tasks/main.yml
similarity index 90%
rename from roles/webserver/tasks/main.yml
rename to roles/webservers/tasks/main.yml
index be86bd5..2846026 100644
--- a/roles/webserver/tasks/main.yml
+++ b/roles/webservers/tasks/main.yml
@@ -15,7 +15,7 @@
       - nginx is defined
       - nginx == true
   - import_tasks: install_php.yml
-  - name: webserver | certbot | install certbot
+  - name: webservers | certbot | install certbot
     package:
       name: certbot
       state: latest
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