From 66198ca1ec5c93be5e208ce40f48f7550eb650f2 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Wed, 9 Jul 2025 04:27:58 +0200
Subject: [PATCH] Shortened webserver to srv-web-

---
 docs/guides/developer/Role_Creation.md         |  4 ++--
 roles/README.md                                | 12 ++++++------
 roles/cln-domains/meta/main.yml                |  2 +-
 roles/docker-compose/README.md                 |  2 +-
 roles/docker-compose/meta/main.yml             |  2 +-
 roles/network-letsencrypt/meta/main.yml        |  2 +-
 .../README.md                                  |  8 ++++----
 .../meta/main.yml                              |  6 +++---
 roles/srv-web-composer/tasks/main.yml          |  7 +++++++
 .../{webserver-core => srv-web-core}/README.md |  0
 .../handlers/main.yml                          |  0
 .../meta/main.yml                              |  2 +-
 .../tasks/cache_directories.yml                |  0
 .../tasks/main.yml                             |  0
 .../templates/nginx.conf.j2                    |  0
 .../README.md                                  | 10 +++++-----
 .../meta/main.yml                              |  2 +-
 .../README.md                                  |  0
 .../tasks/main.yml                             |  8 ++++----
 .../templates/global.includes.conf.j2          | 12 ++++++------
 .../README.md                                  |  0
 .../meta/main.yml                              |  2 +-
 .../tasks/main.yml                             |  2 +-
 .../templates/global.css.j2                    |  0
 .../templates/head_sub.j2                      |  0
 .../templates/location.conf.j2                 |  0
 .../vars/main.yml                              |  0
 .../README.md                                  |  0
 .../meta/main.yml                              |  2 +-
 .../tasks/main.yml                             |  0
 .../templates/head_sub.j2                      |  0
 .../templates/iframe-handler.js.j2             |  0
 .../README.md                                  |  0
 .../meta/main.yml                              |  2 +-
 .../tasks/main.yml                             |  0
 .../templates/head_sub.j2                      |  0
 .../vars/main.yml                              |  0
 .../README.md                                  |  0
 .../meta/main.yml                              |  2 +-
 .../tasks/main.yml                             |  2 +-
 .../templates/head_sub.j2                      |  0
 .../templates/matomo-tracking.conf.j2          |  0
 .../templates/matomo-tracking.js.j2            |  0
 .../vars/main.yml                              |  0
 .../README.md                                  |  2 +-
 .../Todo.md                                    |  0
 .../meta/main.yml                              |  2 +-
 .../headers/content_security_policy.conf.j2    |  0
 .../templates/location/proxy_basic.conf.j2     |  2 +-
 .../templates/location/proxy_cache.conf.j2     |  0
 .../templates/vhost/basic.conf.j2              | 14 +++++++-------
 .../templates/vhost/ws_generic.conf.j2         |  4 ++--
 .../README.md                                  |  8 ++++----
 .../defaults/main.yml                          |  2 +-
 .../meta/main.yml                              |  2 +-
 .../tasks/main.yml                             |  2 +-
 .../vars/main.yml                              |  0
 .../README.md                                  |  8 ++++----
 .../SETUP.md                                   |  0
 .../files/srv-web-proxy-tls-deploy.sh}         |  0
 .../srv-web-proxy-tls-deploy/handlers/main.yml |  7 +++++++
 .../meta/main.yml                              |  0
 .../tasks/main.yml                             | 18 +++++++++---------
 .../srv-web-proxy-tls-deploy.service.j2}       |  2 +-
 .../vars/main.yml                              |  2 +-
 .../README.md                                  |  0
 .../meta/main.yml                              |  2 +-
 .../tasks/flavors/dedicated.yml                |  0
 .../tasks/flavors/san.yml                      |  0
 .../tasks/flavors/wildcard.yml                 |  0
 .../tasks/main.yml                             |  0
 .../README.md                                  |  0
 .../handlers/main.yml                          |  2 +-
 .../meta/main.yml                              |  2 +-
 .../tasks/main.yml                             |  6 +++---
 .../templates/srv-web-tls-renew.service.j2}    |  0
 roles/web-app-akaunting/tasks/main.yml         |  4 ++--
 roles/web-app-attendize/tasks/main.yml         |  4 ++--
 roles/web-app-baserow/tasks/main.yml           |  4 ++--
 roles/web-app-bigbluebutton/README.md          |  2 +-
 roles/web-app-bigbluebutton/tasks/main.yml     |  4 ++--
 roles/web-app-bluesky/tasks/main.yml           |  4 ++--
 .../web-app-collabora/templates/nginx.conf.j2  |  8 ++++----
 roles/web-app-coturn/tasks/main.yml            |  4 ++--
 roles/web-app-discourse/tasks/main.yml         |  4 ++--
 roles/web-app-elk/tasks/main.yml               |  4 ++--
 roles/web-app-espocrm/tasks/main.yml           |  2 +-
 roles/web-app-friendica/tasks/main.yml         |  4 ++--
 roles/web-app-funkwhale/tasks/main.yml         |  4 ++--
 roles/web-app-fusiondirectory/README.md        |  2 +-
 roles/web-app-fusiondirectory/tasks/main.yml   |  4 ++--
 roles/web-app-gitea/tasks/main.yml             |  4 ++--
 roles/web-app-gitlab/tasks/main.yml            |  4 ++--
 roles/web-app-jenkins/meta/main.yml            |  2 +-
 roles/web-app-jenkins/tasks/main.yml           |  4 ++--
 roles/web-app-joomla/tasks/main.yml            |  4 ++--
 roles/web-app-keycloak/tasks/main.yml          |  4 ++--
 roles/web-app-lam/tasks/main.yml               |  4 ++--
 roles/web-app-libretranslate/tasks/main.yml    |  4 ++--
 roles/web-app-listmonk/tasks/main.yml          |  4 ++--
 roles/web-app-mailu/tasks/main.yml             |  8 ++++----
 roles/web-app-mastodon/tasks/main.yml          |  2 +-
 roles/web-app-matomo/tasks/main.yml            |  4 ++--
 roles/web-app-matrix-deprecated/meta/main.yml  |  2 +-
 roles/web-app-matrix-deprecated/tasks/main.yml |  4 ++--
 roles/web-app-matrix/tasks/main.yml            |  6 +++---
 roles/web-app-matrix/templates/nginx.conf.j2   |  4 ++--
 roles/web-app-mediawiki/tasks/main.yml         |  4 ++--
 roles/web-app-mobilizon/tasks/main.yml         |  4 ++--
 roles/web-app-moodle/tasks/main.yml            |  4 ++--
 roles/web-app-mybb/meta/main.yml               |  2 +-
 roles/web-app-mybb/tasks/setup-domain.yml      |  4 ++--
 roles/web-app-nextcloud/tasks/main.yml         |  2 +-
 .../templates/nginx/host.conf.j2               |  4 ++--
 roles/web-app-openproject/tasks/main.yml       |  4 ++--
 .../web-app-peertube/tasks/create-domains.yml  |  2 +-
 .../templates/peertube.conf.j2                 |  4 ++--
 roles/web-app-pgadmin/tasks/main.yml           |  4 ++--
 roles/web-app-phpldapadmin/tasks/main.yml      |  4 ++--
 roles/web-app-phpmyadmin/tasks/main.yml        |  4 ++--
 roles/web-app-pixelfed/tasks/main.yml          |  4 ++--
 roles/web-app-portfolio/tasks/main.yml         |  4 ++--
 roles/web-app-presentation/tasks/main.yml      |  4 ++--
 roles/web-app-pretix/tasks/main.yml            |  4 ++--
 roles/web-app-simpleicons/tasks/main.yml       |  4 ++--
 roles/web-app-snipe-it/tasks/main.yml          |  4 ++--
 roles/web-app-sphinx/tasks/main.yml            |  4 ++--
 roles/web-app-syncope/tasks/main.yml           |  2 +-
 roles/web-app-syncope/templates/proxy.conf     |  4 ++--
 roles/web-app-taiga/README.md                  |  2 +-
 roles/web-app-taiga/tasks/main.yml             |  4 ++--
 roles/web-app-wordpress/tasks/main.yml         |  4 ++--
 roles/web-app-yourls/tasks/main.yml            |  4 ++--
 roles/web-redirect-domains/README.md           |  2 +-
 roles/web-redirect-domains/meta/main.yml       |  2 +-
 .../tasks/redirect-domain.yml                  |  2 +-
 roles/web-redirect-www/meta/main.yml           |  2 +-
 roles/web-service-files/meta/main.yml          |  2 +-
 roles/web-service-files/tasks/main.yml         |  2 +-
 .../web-service-files/templates/nginx.conf.j2  |  4 ++--
 roles/web-service-html/meta/main.yml           |  2 +-
 roles/web-service-html/tasks/main.yml          |  2 +-
 roles/web-service-html/templates/nginx.conf.j2 |  4 ++--
 roles/webserver-composer/tasks/main.yml        |  7 -------
 .../handlers/main.yml                          |  7 -------
 templates/roles/web-app/tasks/main.yml.j2      |  4 ++--
 146 files changed, 218 insertions(+), 218 deletions(-)
 rename roles/{webserver-composer => srv-web-composer}/README.md (87%)
 rename roles/{webserver-composer => srv-web-composer}/meta/main.yml (91%)
 create mode 100644 roles/srv-web-composer/tasks/main.yml
 rename roles/{webserver-core => srv-web-core}/README.md (100%)
 rename roles/{webserver-core => srv-web-core}/handlers/main.yml (100%)
 rename roles/{webserver-core => srv-web-core}/meta/main.yml (97%)
 rename roles/{webserver-core => srv-web-core}/tasks/cache_directories.yml (100%)
 rename roles/{webserver-core => srv-web-core}/tasks/main.yml (100%)
 rename roles/{webserver-core => srv-web-core}/templates/nginx.conf.j2 (100%)
 rename roles/{webserver-https => srv-web-https}/README.md (79%)
 rename roles/{webserver-https => srv-web-https}/meta/main.yml (97%)
 rename roles/{webserver-injector-core => srv-web-injector-core}/README.md (100%)
 rename roles/{webserver-injector-core => srv-web-injector-core}/tasks/main.yml (79%)
 rename roles/{webserver-injector-core => srv-web-injector-core}/templates/global.includes.conf.j2 (67%)
 rename roles/{webserver-injector-css => srv-web-injector-css}/README.md (100%)
 rename roles/{webserver-injector-css => srv-web-injector-css}/meta/main.yml (97%)
 rename roles/{webserver-injector-css => srv-web-injector-css}/tasks/main.yml (95%)
 rename roles/{webserver-injector-css => srv-web-injector-css}/templates/global.css.j2 (100%)
 rename roles/{webserver-injector-css => srv-web-injector-css}/templates/head_sub.j2 (100%)
 rename roles/{webserver-injector-css => srv-web-injector-css}/templates/location.conf.j2 (100%)
 rename roles/{webserver-injector-css => srv-web-injector-css}/vars/main.yml (100%)
 rename roles/{webserver-injector-iframe => srv-web-injector-iframe}/README.md (100%)
 rename roles/{webserver-injector-iframe => srv-web-injector-iframe}/meta/main.yml (97%)
 rename roles/{webserver-injector-iframe => srv-web-injector-iframe}/tasks/main.yml (100%)
 rename roles/{webserver-injector-iframe => srv-web-injector-iframe}/templates/head_sub.j2 (100%)
 rename roles/{webserver-injector-iframe => srv-web-injector-iframe}/templates/iframe-handler.js.j2 (100%)
 rename roles/{webserver-injector-javascript => srv-web-injector-javascript}/README.md (100%)
 rename roles/{webserver-injector-javascript => srv-web-injector-javascript}/meta/main.yml (97%)
 rename roles/{webserver-injector-javascript => srv-web-injector-javascript}/tasks/main.yml (100%)
 rename roles/{webserver-injector-javascript => srv-web-injector-javascript}/templates/head_sub.j2 (100%)
 rename roles/{webserver-injector-javascript => srv-web-injector-javascript}/vars/main.yml (100%)
 rename roles/{webserver-injector-matomo => srv-web-injector-matomo}/README.md (100%)
 rename roles/{webserver-injector-matomo => srv-web-injector-matomo}/meta/main.yml (83%)
 rename roles/{webserver-injector-matomo => srv-web-injector-matomo}/tasks/main.yml (96%)
 rename roles/{webserver-injector-matomo => srv-web-injector-matomo}/templates/head_sub.j2 (100%)
 rename roles/{webserver-injector-matomo => srv-web-injector-matomo}/templates/matomo-tracking.conf.j2 (100%)
 rename roles/{webserver-injector-matomo => srv-web-injector-matomo}/templates/matomo-tracking.js.j2 (100%)
 rename roles/{webserver-injector-matomo => srv-web-injector-matomo}/vars/main.yml (100%)
 rename roles/{webserver-proxy-core => srv-web-proxy-core}/README.md (93%)
 rename roles/{webserver-proxy-core => srv-web-proxy-core}/Todo.md (100%)
 rename roles/{webserver-proxy-core => srv-web-proxy-core}/meta/main.yml (97%)
 rename roles/{webserver-proxy-core => srv-web-proxy-core}/templates/headers/content_security_policy.conf.j2 (100%)
 rename roles/{webserver-proxy-core => srv-web-proxy-core}/templates/location/proxy_basic.conf.j2 (90%)
 rename roles/{webserver-proxy-core => srv-web-proxy-core}/templates/location/proxy_cache.conf.j2 (100%)
 rename roles/{webserver-proxy-core => srv-web-proxy-core}/templates/vhost/basic.conf.j2 (75%)
 rename roles/{webserver-proxy-core => srv-web-proxy-core}/templates/vhost/ws_generic.conf.j2 (88%)
 rename roles/{webserver-proxy-domain => srv-web-proxy-domain}/README.md (81%)
 rename roles/{webserver-proxy-domain => srv-web-proxy-domain}/defaults/main.yml (60%)
 rename roles/{webserver-proxy-domain => srv-web-proxy-domain}/meta/main.yml (97%)
 rename roles/{webserver-proxy-domain => srv-web-proxy-domain}/tasks/main.yml (96%)
 rename roles/{webserver-proxy-domain => srv-web-proxy-domain}/vars/main.yml (100%)
 rename roles/{webserver-proxy-tls-deploy => srv-web-proxy-tls-deploy}/README.md (88%)
 rename roles/{webserver-proxy-tls-deploy => srv-web-proxy-tls-deploy}/SETUP.md (100%)
 rename roles/{webserver-proxy-tls-deploy/files/webserver-proxy-tls-deploy.sh => srv-web-proxy-tls-deploy/files/srv-web-proxy-tls-deploy.sh} (100%)
 create mode 100644 roles/srv-web-proxy-tls-deploy/handlers/main.yml
 rename roles/{webserver-proxy-tls-deploy => srv-web-proxy-tls-deploy}/meta/main.yml (100%)
 rename roles/{webserver-proxy-tls-deploy => srv-web-proxy-tls-deploy}/tasks/main.yml (53%)
 rename roles/{webserver-proxy-tls-deploy/templates/webserver-proxy-tls-deploy.service.j2 => srv-web-proxy-tls-deploy/templates/srv-web-proxy-tls-deploy.service.j2} (50%)
 rename roles/{webserver-proxy-tls-deploy => srv-web-proxy-tls-deploy}/vars/main.yml (67%)
 rename roles/{webserver-tls-core => srv-web-tls-core}/README.md (100%)
 rename roles/{webserver-tls-core => srv-web-tls-core}/meta/main.yml (97%)
 rename roles/{webserver-tls-core => srv-web-tls-core}/tasks/flavors/dedicated.yml (100%)
 rename roles/{webserver-tls-core => srv-web-tls-core}/tasks/flavors/san.yml (100%)
 rename roles/{webserver-tls-core => srv-web-tls-core}/tasks/flavors/wildcard.yml (100%)
 rename roles/{webserver-tls-core => srv-web-tls-core}/tasks/main.yml (100%)
 rename roles/{webserver-tls-renew => srv-web-tls-renew}/README.md (100%)
 rename roles/{webserver-tls-renew => srv-web-tls-renew}/handlers/main.yml (69%)
 rename roles/{webserver-tls-renew => srv-web-tls-renew}/meta/main.yml (97%)
 rename roles/{webserver-tls-renew => srv-web-tls-renew}/tasks/main.yml (82%)
 rename roles/{webserver-tls-renew/templates/webserver-tls-renew.service.j2 => srv-web-tls-renew/templates/srv-web-tls-renew.service.j2} (100%)
 delete mode 100644 roles/webserver-composer/tasks/main.yml
 delete mode 100644 roles/webserver-proxy-tls-deploy/handlers/main.yml

diff --git a/docs/guides/developer/Role_Creation.md b/docs/guides/developer/Role_Creation.md
index 0dc8f271..076156e8 100644
--- a/docs/guides/developer/Role_Creation.md
+++ b/docs/guides/developer/Role_Creation.md
@@ -91,9 +91,9 @@ Now that you have defined the application settings, domain, and application ID,
       command: pkgmgr path cymais-my_service
       register: path_cymais_my_service_output
 
-    - name: "include role webserver-proxy-domain for {{ application_id }}"
+    - name: "include role srv-web-proxy-domain for {{ application_id }}"
       include_role:
-        name: webserver-proxy-domain
+        name: srv-web-proxy-domain
       vars:
         domain: "{{ domains | get_domain(application_id) }}"
         http_port: "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/README.md b/roles/README.md
index a323c74c..07188a71 100644
--- a/roles/README.md
+++ b/roles/README.md
@@ -24,19 +24,19 @@ For a complete list of role categories and detailed definitions, see:
 
 ## Webserver & HTTP
 
-- **webserver-core**  
+- **srv-web-core**  
   Installs and configures the base Nginx server.
 
-- **webserver-tls-***  
+- **srv-web-tls-***  
   Manages TLS certificates and renewal (formerly “https”).
 
-- **webserver-proxy-***  
+- **srv-web-proxy-***  
   Proxy and vhost orchestration roles (domain setup, OAuth2 proxy, etc.)
 
-- **webserver-injector-***  
+- **srv-web-injector-***  
   HTML response modifiers: CSS, JS, Matomo tracking, iframe notifier.
 
-- **webserver-composer**  
+- **srv-web-composer**  
   Aggregates multiple sub-filters into one include for your vhost.
 
 - **web-service-***  
@@ -111,7 +111,7 @@ For a complete list of role categories and detailed definitions, see:
 ---
 
 > **Tip:** To find a role quickly, search for its prefix:  
-> `core-`, `gen-`, `desk-`, `webserver-`, `web-service-`, `web-app-`,  
+> `core-`, `gen-`, `desk-`, `srv-web-`, `web-service-`, `web-app-`,  
 > `network-`, `service-`, `monitor-`, `alert-`, `maint-`, `cln-`,  
 > `bkp-`, `update-`, `pkgmgr-`, `user-`.
 
diff --git a/roles/cln-domains/meta/main.yml b/roles/cln-domains/meta/main.yml
index 963a93f8..a2d7c0f3 100644
--- a/roles/cln-domains/meta/main.yml
+++ b/roles/cln-domains/meta/main.yml
@@ -21,4 +21,4 @@ galaxy_info:
   issue_tracker_url: "https://s.veen.world/cymaisissues"
   documentation: "https://s.veen.world/cymais"
 dependencies:
-  - webserver-core
\ No newline at end of file
+  - srv-web-core
\ No newline at end of file
diff --git a/roles/docker-compose/README.md b/roles/docker-compose/README.md
index 5bd3795b..73c9a9ac 100644
--- a/roles/docker-compose/README.md
+++ b/roles/docker-compose/README.md
@@ -20,7 +20,7 @@ To offer a centralized, extensible system for managing containerized application
 - **Reset Logic:** Cleans previous Compose project files and data when `mode_reset` is enabled.
 - **Handlers for Runtime Control:** Automatically builds, sets up, or restarts containers based on handlers.
 - **Template-ready Service Files:** Predefined service base and health check templates.
-- **Integration Support:** Compatible with `webserver-proxy-core` and other CyMaIS service roles.
+- **Integration Support:** Compatible with `srv-web-proxy-core` and other CyMaIS service roles.
 
 ## Administration Tips
 
diff --git a/roles/docker-compose/meta/main.yml b/roles/docker-compose/meta/main.yml
index fbe9c04c..3a491230 100644
--- a/roles/docker-compose/meta/main.yml
+++ b/roles/docker-compose/meta/main.yml
@@ -25,5 +25,5 @@ galaxy_info:
   issue_tracker_url: https://s.veen.world/cymaisissues
   documentation: https://s.veen.world/cymais
 dependencies:
-  - webserver-proxy-core
+  - srv-web-proxy-core
   - docker-container # Necessary for template use
\ No newline at end of file
diff --git a/roles/network-letsencrypt/meta/main.yml b/roles/network-letsencrypt/meta/main.yml
index bc6476a2..5abfb5dd 100644
--- a/roles/network-letsencrypt/meta/main.yml
+++ b/roles/network-letsencrypt/meta/main.yml
@@ -23,4 +23,4 @@ galaxy_info:
   issue_tracker_url: "https://s.veen.world/cymaisissues"
   documentation: "https://s.veen.world/cymais"
 dependencies:
-  - webserver-tls-renew
+  - srv-web-tls-renew
diff --git a/roles/webserver-composer/README.md b/roles/srv-web-composer/README.md
similarity index 87%
rename from roles/webserver-composer/README.md
rename to roles/srv-web-composer/README.md
index abe86e1d..0b221546 100644
--- a/roles/webserver-composer/README.md
+++ b/roles/srv-web-composer/README.md
@@ -1,10 +1,10 @@
-# Role: webserver-composer
+# Role: srv-web-composer
 
 This Ansible role composes and orchestrates all necessary HTTPS-layer tasks and HTML-content injections for your webserver domains. It integrates two key sub-roles into a unified workflow:
 
-1. **`webserver-injector-core`**
+1. **`srv-web-injector-core`**
    Injects global HTML snippets (CSS, Matomo tracking, iFrame notifier, custom JavaScript) into responses using Nginx `sub_filter`.
-2. **`webserver-tls-core`**
+2. **`srv-web-tls-core`**
    Handles issuing, renewing, and managing TLS certificates via ACME/Certbot.
 
 By combining encryption setup with content enhancements, this role streamlines domain provisioning for secure, fully-featured HTTP/HTTPS delivery.
@@ -16,7 +16,7 @@ By combining encryption setup with content enhancements, this role streamlines d
 * **Content Injection**
   Adds global theming, analytics, and custom scripts before `</head>` and tracking noscript tags before `</body>`.
 * **Certificate Management**
-  Automates cert issuance and renewal via `webserver-tls-core`.
+  Automates cert issuance and renewal via `srv-web-tls-core`.
 * **Idempotent Workflow**
   Ensures each component runs only once per domain.
 * **Simplified Playbooks**
diff --git a/roles/webserver-composer/meta/main.yml b/roles/srv-web-composer/meta/main.yml
similarity index 91%
rename from roles/webserver-composer/meta/main.yml
rename to roles/srv-web-composer/meta/main.yml
index 51a63c96..481a3677 100644
--- a/roles/webserver-composer/meta/main.yml
+++ b/roles/srv-web-composer/meta/main.yml
@@ -27,7 +27,7 @@ galaxy_info:
     - orchestration
   repository: "https://github.com/kevinveenbirkenbach/cymais"
   issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues"
-  documentation: "https://github.com/kevinveenbirkenbach/cymais/roles/webserver-composer"
+  documentation: "https://github.com/kevinveenbirkenbach/cymais/roles/srv-web-composer"
 dependencies:
-  - webserver-injector-core
-  - webserver-tls-core
+  - srv-web-injector-core
+  - srv-web-tls-core
diff --git a/roles/srv-web-composer/tasks/main.yml b/roles/srv-web-composer/tasks/main.yml
new file mode 100644
index 00000000..6e0d41fb
--- /dev/null
+++ b/roles/srv-web-composer/tasks/main.yml
@@ -0,0 +1,7 @@
+- name: "include role srv-web-injector-core for {{domain}}"
+  include_role: 
+    name: srv-web-injector-core
+
+- name: "include role srv-web-tls-core for {{domain}}"
+  include_role: 
+    name: srv-web-tls-core
\ No newline at end of file
diff --git a/roles/webserver-core/README.md b/roles/srv-web-core/README.md
similarity index 100%
rename from roles/webserver-core/README.md
rename to roles/srv-web-core/README.md
diff --git a/roles/webserver-core/handlers/main.yml b/roles/srv-web-core/handlers/main.yml
similarity index 100%
rename from roles/webserver-core/handlers/main.yml
rename to roles/srv-web-core/handlers/main.yml
diff --git a/roles/webserver-core/meta/main.yml b/roles/srv-web-core/meta/main.yml
similarity index 97%
rename from roles/webserver-core/meta/main.yml
rename to roles/srv-web-core/meta/main.yml
index 514f9158..542b4f53 100644
--- a/roles/webserver-core/meta/main.yml
+++ b/roles/srv-web-core/meta/main.yml
@@ -18,7 +18,7 @@ galaxy_info:
     - performance
   repository: "https://github.com/kevinveenbirkenbach/cymais"
   issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues"
-  documentation: "https://github.com/kevinveenbirkenbach/cymais/roles/webserver-core"
+  documentation: "https://github.com/kevinveenbirkenbach/cymais/roles/srv-web-core"
 dependencies:
   - mon-bot-webserver
   - mon-bot-csp
\ No newline at end of file
diff --git a/roles/webserver-core/tasks/cache_directories.yml b/roles/srv-web-core/tasks/cache_directories.yml
similarity index 100%
rename from roles/webserver-core/tasks/cache_directories.yml
rename to roles/srv-web-core/tasks/cache_directories.yml
diff --git a/roles/webserver-core/tasks/main.yml b/roles/srv-web-core/tasks/main.yml
similarity index 100%
rename from roles/webserver-core/tasks/main.yml
rename to roles/srv-web-core/tasks/main.yml
diff --git a/roles/webserver-core/templates/nginx.conf.j2 b/roles/srv-web-core/templates/nginx.conf.j2
similarity index 100%
rename from roles/webserver-core/templates/nginx.conf.j2
rename to roles/srv-web-core/templates/nginx.conf.j2
diff --git a/roles/webserver-https/README.md b/roles/srv-web-https/README.md
similarity index 79%
rename from roles/webserver-https/README.md
rename to roles/srv-web-https/README.md
index 86921a26..6ebc395b 100644
--- a/roles/webserver-https/README.md
+++ b/roles/srv-web-https/README.md
@@ -1,21 +1,21 @@
 # Webserver HTTPS Provisioning 🚀
 
 ## Description
-The **webserver-https** role extends a basic Nginx installation by wiring in everything you need to serve content over HTTPS:
+The **srv-web-https** role extends a basic Nginx installation by wiring in everything you need to serve content over HTTPS:
 
 1. Ensures your Nginx server is configured for SSL/TLS.
 2. Pulls in Let’s Encrypt ACME challenge handling.
 3. Applies global cleanup of unused domain configs.
 
-This role is built on top of your existing `webserver-core` role, and it automates the end-to-end process of turning HTTP sites into secure HTTPS sites.
+This role is built on top of your existing `srv-web-core` role, and it automates the end-to-end process of turning HTTP sites into secure HTTPS sites.
 
 ---
 
 ## Overview
 
-When you apply **webserver-https**, it will:
+When you apply **srv-web-https**, it will:
 
-1. **Include** the `webserver-core` role to install and configure Nginx.  
+1. **Include** the `srv-web-core` role to install and configure Nginx.  
 2. **Clean up** any stale vHost files under `cln-domains`.  
 3. **Deploy** the Let’s Encrypt challenge-and-redirect snippet from `network-letsencrypt`.  
 4. **Reload** Nginx automatically when any template changes.
@@ -42,7 +42,7 @@ All tasks are idempotent—once your certificates are in place and your configur
 
 ## Requirements
 
-- A working `webserver-core` setup.
+- A working `srv-web-core` setup.
 - DNS managed via Cloudflare (for CAA record tasks) or equivalent ACME DNS flow.
 - Variables:
   - `certbot_webroot_path`  
diff --git a/roles/webserver-https/meta/main.yml b/roles/srv-web-https/meta/main.yml
similarity index 97%
rename from roles/webserver-https/meta/main.yml
rename to roles/srv-web-https/meta/main.yml
index 1c313afd..e020c460 100644
--- a/roles/webserver-https/meta/main.yml
+++ b/roles/srv-web-https/meta/main.yml
@@ -24,6 +24,6 @@ galaxy_info:
   issue_tracker_url: "https://s.veen.world/cymaisissues"
 
 dependencies:
-  - webserver-core
+  - srv-web-core
   - cln-domains
   - network-letsencrypt
\ No newline at end of file
diff --git a/roles/webserver-injector-core/README.md b/roles/srv-web-injector-core/README.md
similarity index 100%
rename from roles/webserver-injector-core/README.md
rename to roles/srv-web-injector-core/README.md
diff --git a/roles/webserver-injector-core/tasks/main.yml b/roles/srv-web-injector-core/tasks/main.yml
similarity index 79%
rename from roles/webserver-injector-core/tasks/main.yml
rename to roles/srv-web-injector-core/tasks/main.yml
index c051c8a1..7161ef72 100644
--- a/roles/webserver-injector-core/tasks/main.yml
+++ b/roles/srv-web-injector-core/tasks/main.yml
@@ -1,19 +1,19 @@
 - name: "Activate Global CSS for {{domain}}"
   include_role:
-    name: webserver-injector-css
+    name: srv-web-injector-css
   when: applications | is_feature_enabled('css',application_id)
 
 - name: "Activate Global Matomo Tracking for {{domain}}"
   include_role:
-    name: webserver-injector-matomo
+    name: srv-web-injector-matomo
   when: applications | is_feature_enabled('matomo',application_id)
 
 - name: "Activate Portfolio iFrame Notifier for {{ domain }}"
   include_role:
-    name: webserver-injector-iframe
+    name: srv-web-injector-iframe
   when: applications | is_feature_enabled('portfolio_iframe', application_id)
 
 - name: "Activate Javascript for {{ domain }}"
   include_role:
-    name: webserver-injector-javascript
+    name: srv-web-injector-javascript
   when: applications | is_feature_enabled('javascript', application_id)
\ No newline at end of file
diff --git a/roles/webserver-injector-core/templates/global.includes.conf.j2 b/roles/srv-web-injector-core/templates/global.includes.conf.j2
similarity index 67%
rename from roles/webserver-injector-core/templates/global.includes.conf.j2
rename to roles/srv-web-injector-core/templates/global.includes.conf.j2
index d0f06e11..985e8dcd 100644
--- a/roles/webserver-injector-core/templates/global.includes.conf.j2
+++ b/roles/srv-web-injector-core/templates/global.includes.conf.j2
@@ -10,24 +10,24 @@ sub_filter_types text/html;
 {% if modifier_iframe_enabled or modifier_css_enabled or modifier_matomo_enabled or modifier_javascript_enabled %}
 sub_filter '</head>' ' 
         {%- if modifier_css_enabled -%}
-          {%- include "roles/webserver-injector-css/templates/head_sub.j2" -%}
+          {%- include "roles/srv-web-injector-css/templates/head_sub.j2" -%}
         {%- endif -%}
         {%- if modifier_matomo_enabled -%}
-          {%- include "roles/webserver-injector-matomo/templates/head_sub.j2" -%}
+          {%- include "roles/srv-web-injector-matomo/templates/head_sub.j2" -%}
         {%- endif -%}
         {%- if modifier_iframe_enabled -%}
-          {%- include "roles/webserver-injector-iframe/templates/head_sub.j2" -%}
+          {%- include "roles/srv-web-injector-iframe/templates/head_sub.j2" -%}
         {%- endif -%}
         {%- if modifier_javascript_enabled -%}
-          {%- include "roles/webserver-injector-javascript/templates/head_sub.j2" -%}
+          {%- include "roles/srv-web-injector-javascript/templates/head_sub.j2" -%}
         {%- endif -%}
       </head>';
 {% endif %}
 
 {% if modifier_css_enabled | bool %}
-{% include 'roles/webserver-injector-css/templates/location.conf.j2' %}
+{% include 'roles/srv-web-injector-css/templates/location.conf.j2' %}
 {% endif %}
 
 {% if modifier_matomo_enabled %}
-{% include 'roles/webserver-injector-matomo/templates/matomo-tracking.conf.j2' %}
+{% include 'roles/srv-web-injector-matomo/templates/matomo-tracking.conf.j2' %}
 {% endif %}
\ No newline at end of file
diff --git a/roles/webserver-injector-css/README.md b/roles/srv-web-injector-css/README.md
similarity index 100%
rename from roles/webserver-injector-css/README.md
rename to roles/srv-web-injector-css/README.md
diff --git a/roles/webserver-injector-css/meta/main.yml b/roles/srv-web-injector-css/meta/main.yml
similarity index 97%
rename from roles/webserver-injector-css/meta/main.yml
rename to roles/srv-web-injector-css/meta/main.yml
index 60b7bd2a..0f43c56d 100644
--- a/roles/webserver-injector-css/meta/main.yml
+++ b/roles/srv-web-injector-css/meta/main.yml
@@ -26,4 +26,4 @@ galaxy_info:
   issue_tracker_url: https://s.veen.world/cymaisissues
   documentation: https://s.veen.world/cymais
 dependencies:
-  - webserver-core
\ No newline at end of file
+  - srv-web-core
\ No newline at end of file
diff --git a/roles/webserver-injector-css/tasks/main.yml b/roles/srv-web-injector-css/tasks/main.yml
similarity index 95%
rename from roles/webserver-injector-css/tasks/main.yml
rename to roles/srv-web-injector-css/tasks/main.yml
index bec9eba6..f692c159 100644
--- a/roles/webserver-injector-css/tasks/main.yml
+++ b/roles/srv-web-injector-css/tasks/main.yml
@@ -1,4 +1,4 @@
-# Load this role via webserver-injector-core for consistency
+# Load this role via srv-web-injector-core for consistency
 
 - name: Generate color palette with colorscheme-generator
   set_fact:
diff --git a/roles/webserver-injector-css/templates/global.css.j2 b/roles/srv-web-injector-css/templates/global.css.j2
similarity index 100%
rename from roles/webserver-injector-css/templates/global.css.j2
rename to roles/srv-web-injector-css/templates/global.css.j2
diff --git a/roles/webserver-injector-css/templates/head_sub.j2 b/roles/srv-web-injector-css/templates/head_sub.j2
similarity index 100%
rename from roles/webserver-injector-css/templates/head_sub.j2
rename to roles/srv-web-injector-css/templates/head_sub.j2
diff --git a/roles/webserver-injector-css/templates/location.conf.j2 b/roles/srv-web-injector-css/templates/location.conf.j2
similarity index 100%
rename from roles/webserver-injector-css/templates/location.conf.j2
rename to roles/srv-web-injector-css/templates/location.conf.j2
diff --git a/roles/webserver-injector-css/vars/main.yml b/roles/srv-web-injector-css/vars/main.yml
similarity index 100%
rename from roles/webserver-injector-css/vars/main.yml
rename to roles/srv-web-injector-css/vars/main.yml
diff --git a/roles/webserver-injector-iframe/README.md b/roles/srv-web-injector-iframe/README.md
similarity index 100%
rename from roles/webserver-injector-iframe/README.md
rename to roles/srv-web-injector-iframe/README.md
diff --git a/roles/webserver-injector-iframe/meta/main.yml b/roles/srv-web-injector-iframe/meta/main.yml
similarity index 97%
rename from roles/webserver-injector-iframe/meta/main.yml
rename to roles/srv-web-injector-iframe/meta/main.yml
index fb0db805..5e32010c 100644
--- a/roles/webserver-injector-iframe/meta/main.yml
+++ b/roles/srv-web-injector-iframe/meta/main.yml
@@ -25,4 +25,4 @@ galaxy_info:
     - security
     - postMessage
 dependencies:
-  - webserver-core
\ No newline at end of file
+  - srv-web-core
\ No newline at end of file
diff --git a/roles/webserver-injector-iframe/tasks/main.yml b/roles/srv-web-injector-iframe/tasks/main.yml
similarity index 100%
rename from roles/webserver-injector-iframe/tasks/main.yml
rename to roles/srv-web-injector-iframe/tasks/main.yml
diff --git a/roles/webserver-injector-iframe/templates/head_sub.j2 b/roles/srv-web-injector-iframe/templates/head_sub.j2
similarity index 100%
rename from roles/webserver-injector-iframe/templates/head_sub.j2
rename to roles/srv-web-injector-iframe/templates/head_sub.j2
diff --git a/roles/webserver-injector-iframe/templates/iframe-handler.js.j2 b/roles/srv-web-injector-iframe/templates/iframe-handler.js.j2
similarity index 100%
rename from roles/webserver-injector-iframe/templates/iframe-handler.js.j2
rename to roles/srv-web-injector-iframe/templates/iframe-handler.js.j2
diff --git a/roles/webserver-injector-javascript/README.md b/roles/srv-web-injector-javascript/README.md
similarity index 100%
rename from roles/webserver-injector-javascript/README.md
rename to roles/srv-web-injector-javascript/README.md
diff --git a/roles/webserver-injector-javascript/meta/main.yml b/roles/srv-web-injector-javascript/meta/main.yml
similarity index 97%
rename from roles/webserver-injector-javascript/meta/main.yml
rename to roles/srv-web-injector-javascript/meta/main.yml
index d5a84719..997918fd 100644
--- a/roles/webserver-injector-javascript/meta/main.yml
+++ b/roles/srv-web-injector-javascript/meta/main.yml
@@ -25,4 +25,4 @@ galaxy_info:
   issue_tracker_url: "https://s.veen.world/cymaisissues"
 
 dependencies:
-  - webserver-core
+  - srv-web-core
diff --git a/roles/webserver-injector-javascript/tasks/main.yml b/roles/srv-web-injector-javascript/tasks/main.yml
similarity index 100%
rename from roles/webserver-injector-javascript/tasks/main.yml
rename to roles/srv-web-injector-javascript/tasks/main.yml
diff --git a/roles/webserver-injector-javascript/templates/head_sub.j2 b/roles/srv-web-injector-javascript/templates/head_sub.j2
similarity index 100%
rename from roles/webserver-injector-javascript/templates/head_sub.j2
rename to roles/srv-web-injector-javascript/templates/head_sub.j2
diff --git a/roles/webserver-injector-javascript/vars/main.yml b/roles/srv-web-injector-javascript/vars/main.yml
similarity index 100%
rename from roles/webserver-injector-javascript/vars/main.yml
rename to roles/srv-web-injector-javascript/vars/main.yml
diff --git a/roles/webserver-injector-matomo/README.md b/roles/srv-web-injector-matomo/README.md
similarity index 100%
rename from roles/webserver-injector-matomo/README.md
rename to roles/srv-web-injector-matomo/README.md
diff --git a/roles/webserver-injector-matomo/meta/main.yml b/roles/srv-web-injector-matomo/meta/main.yml
similarity index 83%
rename from roles/webserver-injector-matomo/meta/main.yml
rename to roles/srv-web-injector-matomo/meta/main.yml
index 0845a092..e9195e15 100644
--- a/roles/webserver-injector-matomo/meta/main.yml
+++ b/roles/srv-web-injector-matomo/meta/main.yml
@@ -1,3 +1,3 @@
 dependencies:
   # - web-app-matomo Don't activate this otherwise the plays take super long
-  - webserver-core
\ No newline at end of file
+  - srv-web-core
\ No newline at end of file
diff --git a/roles/webserver-injector-matomo/tasks/main.yml b/roles/srv-web-injector-matomo/tasks/main.yml
similarity index 96%
rename from roles/webserver-injector-matomo/tasks/main.yml
rename to roles/srv-web-injector-matomo/tasks/main.yml
index b8f7a01b..1bf323db 100644
--- a/roles/webserver-injector-matomo/tasks/main.yml
+++ b/roles/srv-web-injector-matomo/tasks/main.yml
@@ -1,4 +1,4 @@
-# Load this role via webserver-injector-core for consistency
+# Load this role via srv-web-injector-core for consistency
 
 - name: "Relevant variables for role: {{ role_path | basename }}"
   debug:
diff --git a/roles/webserver-injector-matomo/templates/head_sub.j2 b/roles/srv-web-injector-matomo/templates/head_sub.j2
similarity index 100%
rename from roles/webserver-injector-matomo/templates/head_sub.j2
rename to roles/srv-web-injector-matomo/templates/head_sub.j2
diff --git a/roles/webserver-injector-matomo/templates/matomo-tracking.conf.j2 b/roles/srv-web-injector-matomo/templates/matomo-tracking.conf.j2
similarity index 100%
rename from roles/webserver-injector-matomo/templates/matomo-tracking.conf.j2
rename to roles/srv-web-injector-matomo/templates/matomo-tracking.conf.j2
diff --git a/roles/webserver-injector-matomo/templates/matomo-tracking.js.j2 b/roles/srv-web-injector-matomo/templates/matomo-tracking.js.j2
similarity index 100%
rename from roles/webserver-injector-matomo/templates/matomo-tracking.js.j2
rename to roles/srv-web-injector-matomo/templates/matomo-tracking.js.j2
diff --git a/roles/webserver-injector-matomo/vars/main.yml b/roles/srv-web-injector-matomo/vars/main.yml
similarity index 100%
rename from roles/webserver-injector-matomo/vars/main.yml
rename to roles/srv-web-injector-matomo/vars/main.yml
diff --git a/roles/webserver-proxy-core/README.md b/roles/srv-web-proxy-core/README.md
similarity index 93%
rename from roles/webserver-proxy-core/README.md
rename to roles/srv-web-proxy-core/README.md
index a2223fee..d9b6bdbf 100644
--- a/roles/webserver-proxy-core/README.md
+++ b/roles/srv-web-proxy-core/README.md
@@ -16,7 +16,7 @@ The goal of this role is to deliver a **hassle-free, production-ready reverse pr
 
 ## Features
 
-- **Automatic TLS & HSTS** — integrates with the *webserver-https* role for certificate management.  
+- **Automatic TLS & HSTS** — integrates with the *srv-web-https* role for certificate management.  
 - **Flexible vHost templates** — *basic* and *ws_generic* flavours cover standard HTTP and WebSocket applications.  
 - **Security headers** — sensible defaults plus optional X-Frame-Options / CSP based on application settings.  
 - **WebSocket & HTTP/2 aware** — upgrades, keep-alive tuning, and gzip already configured.  
diff --git a/roles/webserver-proxy-core/Todo.md b/roles/srv-web-proxy-core/Todo.md
similarity index 100%
rename from roles/webserver-proxy-core/Todo.md
rename to roles/srv-web-proxy-core/Todo.md
diff --git a/roles/webserver-proxy-core/meta/main.yml b/roles/srv-web-proxy-core/meta/main.yml
similarity index 97%
rename from roles/webserver-proxy-core/meta/main.yml
rename to roles/srv-web-proxy-core/meta/main.yml
index 8eb551b7..ec4b72f3 100644
--- a/roles/webserver-proxy-core/meta/main.yml
+++ b/roles/srv-web-proxy-core/meta/main.yml
@@ -25,4 +25,4 @@ galaxy_info:
   documentation: https://s.veen.world/cymais
 dependencies:
   - docker
-  - webserver-https
\ No newline at end of file
+  - srv-web-https
\ No newline at end of file
diff --git a/roles/webserver-proxy-core/templates/headers/content_security_policy.conf.j2 b/roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2
similarity index 100%
rename from roles/webserver-proxy-core/templates/headers/content_security_policy.conf.j2
rename to roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2
diff --git a/roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2 b/roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2
similarity index 90%
rename from roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2
rename to roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2
index 6bbefa81..7efe81fd 100644
--- a/roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2
+++ b/roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2
@@ -14,7 +14,7 @@ location {{location | default("/")}}
   proxy_set_header X-Forwarded-Port 443;
   proxy_set_header Accept-Encoding "";
 
-  {% include 'roles/webserver-proxy-core/templates/headers/content_security_policy.conf.j2' %}
+  {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %}
 
   # WebSocket specific header
   proxy_http_version 1.1;
diff --git a/roles/webserver-proxy-core/templates/location/proxy_cache.conf.j2 b/roles/srv-web-proxy-core/templates/location/proxy_cache.conf.j2
similarity index 100%
rename from roles/webserver-proxy-core/templates/location/proxy_cache.conf.j2
rename to roles/srv-web-proxy-core/templates/location/proxy_cache.conf.j2
diff --git a/roles/webserver-proxy-core/templates/vhost/basic.conf.j2 b/roles/srv-web-proxy-core/templates/vhost/basic.conf.j2
similarity index 75%
rename from roles/webserver-proxy-core/templates/vhost/basic.conf.j2
rename to roles/srv-web-proxy-core/templates/vhost/basic.conf.j2
index 93e16a8e..e030ab72 100644
--- a/roles/webserver-proxy-core/templates/vhost/basic.conf.j2
+++ b/roles/srv-web-proxy-core/templates/vhost/basic.conf.j2
@@ -6,7 +6,7 @@ server
     {% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%}
   {% endif %}
 
-  {% include 'roles/webserver-injector-core/templates/global.includes.conf.j2'%}
+  {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%}
   
   {% if nginx_docker_reverse_proxy_extra_configuration is defined %}
     {# Additional Domain Specific Configuration #}
@@ -22,38 +22,38 @@ server
       {# 1. Expose everything by default, then protect blacklisted paths #}
       {% set oauth2_proxy_enabled = false %}
       {% set location = "/" %}
-      {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+      {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
 
       {% for loc in acl.blacklist %}
         {% set oauth2_proxy_enabled = true %}
         {% set location = loc %}
-        {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+        {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
       {% endfor %}
 
     {% elif acl.whitelist is defined %}
       {# 2. Protect everything by default, then expose whitelisted paths #}
       {% set oauth2_proxy_enabled = true %}
       {% set location = "/" %}
-      {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+      {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
 
       {% for loc in acl.whitelist %}
         {% set oauth2_proxy_enabled = false %}
         {% set location = loc %}
-        {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+        {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
       {% endfor %}
 
     {% else %}
       {# 3. OAuth2 enabled but no (or empty) ACL — protect all #}
       {% set oauth2_proxy_enabled = true %}
       {% set location = "/" %}
-      {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+      {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
     {% endif %}
 
   {% else %}
     {# 4. OAuth2 completely disabled — expose all #}
     {% set oauth2_proxy_enabled = false %}
     {% set location = "/" %}
-    {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+    {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
   {% endif %}
 
 }
diff --git a/roles/webserver-proxy-core/templates/vhost/ws_generic.conf.j2 b/roles/srv-web-proxy-core/templates/vhost/ws_generic.conf.j2
similarity index 88%
rename from roles/webserver-proxy-core/templates/vhost/ws_generic.conf.j2
rename to roles/srv-web-proxy-core/templates/vhost/ws_generic.conf.j2
index cc830a25..50e91a78 100644
--- a/roles/webserver-proxy-core/templates/vhost/ws_generic.conf.j2
+++ b/roles/srv-web-proxy-core/templates/vhost/ws_generic.conf.j2
@@ -7,7 +7,7 @@ server {
   server_name {{ domain }};
 
   {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %}
-  {% include 'roles/webserver-injector-core/templates/global.includes.conf.j2' %}
+  {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2' %}
 
   client_max_body_size {{ client_max_body_size | default('100m') }};
   keepalive_timeout    70;
@@ -24,7 +24,7 @@ server {
 
   add_header Strict-Transport-Security "max-age=31536000";
 
-  {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+  {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
 
   {% if ws_path is defined %}
     location {{ ws_path }} {
diff --git a/roles/webserver-proxy-domain/README.md b/roles/srv-web-proxy-domain/README.md
similarity index 81%
rename from roles/webserver-proxy-domain/README.md
rename to roles/srv-web-proxy-domain/README.md
index 5a47eb37..7579c31d 100644
--- a/roles/webserver-proxy-domain/README.md
+++ b/roles/srv-web-proxy-domain/README.md
@@ -6,11 +6,11 @@ This role bootstraps **per-domain Nginx configuration**: it requests TLS certifi
 
 ## Overview
 
-A higher-level orchestration wrapper, *webserver-proxy-domain* ties together several lower-level roles:
+A higher-level orchestration wrapper, *srv-web-proxy-domain* ties together several lower-level roles:
 
-1. **`webserver-injector-core`** – applies global tweaks and includes.  
-2. **`webserver-tls-core`** – obtains Let’s Encrypt certificates.  
-3. **Domain template deployment** – copies a Jinja2 vHost from *webserver-proxy-core*.  
+1. **`srv-web-injector-core`** – applies global tweaks and includes.  
+2. **`srv-web-tls-core`** – obtains Let’s Encrypt certificates.  
+3. **Domain template deployment** – copies a Jinja2 vHost from *srv-web-proxy-core*.  
 4. **`web-app-oauth2-proxy`** *(optional)* – protects the site with OAuth2.
 
 The result is a complete, reproducible domain rollout in a single playbook task.
diff --git a/roles/webserver-proxy-domain/defaults/main.yml b/roles/srv-web-proxy-domain/defaults/main.yml
similarity index 60%
rename from roles/webserver-proxy-domain/defaults/main.yml
rename to roles/srv-web-proxy-domain/defaults/main.yml
index 12d252e6..3ee4c26a 100644
--- a/roles/webserver-proxy-domain/defaults/main.yml
+++ b/roles/srv-web-proxy-domain/defaults/main.yml
@@ -2,4 +2,4 @@
 vhost_flavour:        "basic"               # valid: basic | ws_generic
 
 # build the full template path from the flavour
-vhost_template_src:   "roles/webserver-proxy-core/templates/vhost/{{ vhost_flavour }}.conf.j2"
\ No newline at end of file
+vhost_template_src:   "roles/srv-web-proxy-core/templates/vhost/{{ vhost_flavour }}.conf.j2"
\ No newline at end of file
diff --git a/roles/webserver-proxy-domain/meta/main.yml b/roles/srv-web-proxy-domain/meta/main.yml
similarity index 97%
rename from roles/webserver-proxy-domain/meta/main.yml
rename to roles/srv-web-proxy-domain/meta/main.yml
index bc79348d..5d0443e6 100644
--- a/roles/webserver-proxy-domain/meta/main.yml
+++ b/roles/srv-web-proxy-domain/meta/main.yml
@@ -24,4 +24,4 @@ galaxy_info:
   issue_tracker_url: https://s.veen.world/cymaisissues
   documentation: https://s.veen.world/cymais
 dependencies:
-  - webserver-core
\ No newline at end of file
+  - srv-web-core
\ No newline at end of file
diff --git a/roles/webserver-proxy-domain/tasks/main.yml b/roles/srv-web-proxy-domain/tasks/main.yml
similarity index 96%
rename from roles/webserver-proxy-domain/tasks/main.yml
rename to roles/srv-web-proxy-domain/tasks/main.yml
index 0f269052..e307e328 100644
--- a/roles/webserver-proxy-domain/tasks/main.yml
+++ b/roles/srv-web-proxy-domain/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: "include role for {{domain}} to receive certificates and do the modification routines"
   include_role:
-    name: webserver-composer
+    name: srv-web-composer
     
 - name: "copy nginx domain configuration to {{ configuration_destination }}"
   template:
diff --git a/roles/webserver-proxy-domain/vars/main.yml b/roles/srv-web-proxy-domain/vars/main.yml
similarity index 100%
rename from roles/webserver-proxy-domain/vars/main.yml
rename to roles/srv-web-proxy-domain/vars/main.yml
diff --git a/roles/webserver-proxy-tls-deploy/README.md b/roles/srv-web-proxy-tls-deploy/README.md
similarity index 88%
rename from roles/webserver-proxy-tls-deploy/README.md
rename to roles/srv-web-proxy-tls-deploy/README.md
index bbdc1de8..27067cd1 100644
--- a/roles/webserver-proxy-tls-deploy/README.md
+++ b/roles/srv-web-proxy-tls-deploy/README.md
@@ -21,7 +21,7 @@ This Ansible role simplifies the deployment of **Let's Encrypt certificates** in
 
 ### **1️⃣ Main Tasks**
 1. **Add Deployment Script**  
-   - Copies `webserver-proxy-tls-deploy.sh` to the administrator scripts directory.
+   - Copies `srv-web-proxy-tls-deploy.sh` to the administrator scripts directory.
    
 2. **Create Certificate Directory**  
    - Ensures `cert_mount_directory` exists with proper permissions.
@@ -34,14 +34,14 @@ This Ansible role simplifies the deployment of **Let's Encrypt certificates** in
 
 ### **2️⃣ Handlers**
 - **Restart Nginx Service**  
-  - Restarts `webserver-proxy-tls-deploy` whenever a certificate update occurs.
+  - Restarts `srv-web-proxy-tls-deploy` whenever a certificate update occurs.
 
 ---
 
 ## **🔧 Deploying Certificates into Docker Containers**
 The role **automates copying certificates** into Docker Compose setups.
 
-### **1️⃣ Deployment Script (`webserver-proxy-tls-deploy.sh`)**
+### **1️⃣ Deployment Script (`srv-web-proxy-tls-deploy.sh`)**
 This script:
 - **Copies certificates** to the correct container directory.
 - **Reloads Nginx** inside all running containers.
@@ -49,7 +49,7 @@ This script:
 
 **Usage:**
 ```sh
-sh webserver-proxy-tls-deploy.sh primary_domain /path/to/docker/compose
+sh srv-web-proxy-tls-deploy.sh primary_domain /path/to/docker/compose
 ```
 
 ---
diff --git a/roles/webserver-proxy-tls-deploy/SETUP.md b/roles/srv-web-proxy-tls-deploy/SETUP.md
similarity index 100%
rename from roles/webserver-proxy-tls-deploy/SETUP.md
rename to roles/srv-web-proxy-tls-deploy/SETUP.md
diff --git a/roles/webserver-proxy-tls-deploy/files/webserver-proxy-tls-deploy.sh b/roles/srv-web-proxy-tls-deploy/files/srv-web-proxy-tls-deploy.sh
similarity index 100%
rename from roles/webserver-proxy-tls-deploy/files/webserver-proxy-tls-deploy.sh
rename to roles/srv-web-proxy-tls-deploy/files/srv-web-proxy-tls-deploy.sh
diff --git a/roles/srv-web-proxy-tls-deploy/handlers/main.yml b/roles/srv-web-proxy-tls-deploy/handlers/main.yml
new file mode 100644
index 00000000..829c7872
--- /dev/null
+++ b/roles/srv-web-proxy-tls-deploy/handlers/main.yml
@@ -0,0 +1,7 @@
+---
+- name: "restart srv-web-proxy-tls-deploy.cymais.service"
+  systemd:
+    name:           srv-web-proxy-tls-deploy.{{application_id}}.cymais.service
+    state:          restarted
+    enabled:        yes
+    daemon_reload:  yes
\ No newline at end of file
diff --git a/roles/webserver-proxy-tls-deploy/meta/main.yml b/roles/srv-web-proxy-tls-deploy/meta/main.yml
similarity index 100%
rename from roles/webserver-proxy-tls-deploy/meta/main.yml
rename to roles/srv-web-proxy-tls-deploy/meta/main.yml
diff --git a/roles/webserver-proxy-tls-deploy/tasks/main.yml b/roles/srv-web-proxy-tls-deploy/tasks/main.yml
similarity index 53%
rename from roles/webserver-proxy-tls-deploy/tasks/main.yml
rename to roles/srv-web-proxy-tls-deploy/tasks/main.yml
index 19633d10..b00301e6 100644
--- a/roles/webserver-proxy-tls-deploy/tasks/main.yml
+++ b/roles/srv-web-proxy-tls-deploy/tasks/main.yml
@@ -1,9 +1,9 @@
-- name: add webserver-proxy-tls-deploy.sh
+- name: add srv-web-proxy-tls-deploy.sh
   copy: 
-    src: "webserver-proxy-tls-deploy.sh" 
+    src: "srv-web-proxy-tls-deploy.sh" 
     dest: "{{nginx_docker_cert_deploy_script}}"
   when: run_once_nginx_docker_cert_deploy is not defined
-  notify: restart webserver-proxy-tls-deploy.cymais.service
+  notify: restart srv-web-proxy-tls-deploy.cymais.service
 
 - name: run the nginx_docker_cert_deploy tasks once
   set_fact:
@@ -15,18 +15,18 @@
     path:     "{{cert_mount_directory}}"
     state:    directory
     mode:     0755
-  notify: restart webserver-proxy-tls-deploy.cymais.service
+  notify: restart srv-web-proxy-tls-deploy.cymais.service
 
-- name: configure webserver-proxy-tls-deploy.cymais.service
+- name: configure srv-web-proxy-tls-deploy.cymais.service
   template: 
-    src:  "webserver-proxy-tls-deploy.service.j2"
-    dest: "/etc/systemd/system/webserver-proxy-tls-deploy.{{application_id}}.cymais.service"
-  notify: restart webserver-proxy-tls-deploy.cymais.service
+    src:  "srv-web-proxy-tls-deploy.service.j2"
+    dest: "/etc/systemd/system/srv-web-proxy-tls-deploy.{{application_id}}.cymais.service"
+  notify: restart srv-web-proxy-tls-deploy.cymais.service
 
 - name: "include role for gen-timer for {{service_name}}"
   include_role:
     name: gen-timer
   vars:
     on_calendar:  "{{on_calendar_deploy_certificates}}"
-    service_name: "webserver-proxy-tls-deploy.{{application_id}}"
+    service_name: "srv-web-proxy-tls-deploy.{{application_id}}"
     persistent:   "true"
\ No newline at end of file
diff --git a/roles/webserver-proxy-tls-deploy/templates/webserver-proxy-tls-deploy.service.j2 b/roles/srv-web-proxy-tls-deploy/templates/srv-web-proxy-tls-deploy.service.j2
similarity index 50%
rename from roles/webserver-proxy-tls-deploy/templates/webserver-proxy-tls-deploy.service.j2
rename to roles/srv-web-proxy-tls-deploy/templates/srv-web-proxy-tls-deploy.service.j2
index bab9ca7c..a1ac5c35 100644
--- a/roles/webserver-proxy-tls-deploy/templates/webserver-proxy-tls-deploy.service.j2
+++ b/roles/srv-web-proxy-tls-deploy/templates/srv-web-proxy-tls-deploy.service.j2
@@ -4,4 +4,4 @@ OnFailure=alert-compose.cymais@%n.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/bash {{path_administrator_scripts}}/webserver-proxy-tls-deploy.sh {{ssl_cert_folder}} {{docker_compose.directories.instance}}
+ExecStart=/usr/bin/bash {{path_administrator_scripts}}/srv-web-proxy-tls-deploy.sh {{ssl_cert_folder}} {{docker_compose.directories.instance}}
diff --git a/roles/webserver-proxy-tls-deploy/vars/main.yml b/roles/srv-web-proxy-tls-deploy/vars/main.yml
similarity index 67%
rename from roles/webserver-proxy-tls-deploy/vars/main.yml
rename to roles/srv-web-proxy-tls-deploy/vars/main.yml
index ae982ff9..87d55d1a 100644
--- a/roles/webserver-proxy-tls-deploy/vars/main.yml
+++ b/roles/srv-web-proxy-tls-deploy/vars/main.yml
@@ -1 +1 @@
-nginx_docker_cert_deploy_script:  "{{path_administrator_scripts}}webserver-proxy-tls-deploy.sh"
\ No newline at end of file
+nginx_docker_cert_deploy_script:  "{{path_administrator_scripts}}srv-web-proxy-tls-deploy.sh"
\ No newline at end of file
diff --git a/roles/webserver-tls-core/README.md b/roles/srv-web-tls-core/README.md
similarity index 100%
rename from roles/webserver-tls-core/README.md
rename to roles/srv-web-tls-core/README.md
diff --git a/roles/webserver-tls-core/meta/main.yml b/roles/srv-web-tls-core/meta/main.yml
similarity index 97%
rename from roles/webserver-tls-core/meta/main.yml
rename to roles/srv-web-tls-core/meta/main.yml
index 57c313c7..6e22d4ec 100644
--- a/roles/webserver-tls-core/meta/main.yml
+++ b/roles/srv-web-tls-core/meta/main.yml
@@ -28,4 +28,4 @@ galaxy_info:
   issue_tracker_url: "https://s.veen.world/cymaisissues"
   documentation: "https://s.veen.world/cymais"
 dependencies:
-  - webserver-https
+  - srv-web-https
diff --git a/roles/webserver-tls-core/tasks/flavors/dedicated.yml b/roles/srv-web-tls-core/tasks/flavors/dedicated.yml
similarity index 100%
rename from roles/webserver-tls-core/tasks/flavors/dedicated.yml
rename to roles/srv-web-tls-core/tasks/flavors/dedicated.yml
diff --git a/roles/webserver-tls-core/tasks/flavors/san.yml b/roles/srv-web-tls-core/tasks/flavors/san.yml
similarity index 100%
rename from roles/webserver-tls-core/tasks/flavors/san.yml
rename to roles/srv-web-tls-core/tasks/flavors/san.yml
diff --git a/roles/webserver-tls-core/tasks/flavors/wildcard.yml b/roles/srv-web-tls-core/tasks/flavors/wildcard.yml
similarity index 100%
rename from roles/webserver-tls-core/tasks/flavors/wildcard.yml
rename to roles/srv-web-tls-core/tasks/flavors/wildcard.yml
diff --git a/roles/webserver-tls-core/tasks/main.yml b/roles/srv-web-tls-core/tasks/main.yml
similarity index 100%
rename from roles/webserver-tls-core/tasks/main.yml
rename to roles/srv-web-tls-core/tasks/main.yml
diff --git a/roles/webserver-tls-renew/README.md b/roles/srv-web-tls-renew/README.md
similarity index 100%
rename from roles/webserver-tls-renew/README.md
rename to roles/srv-web-tls-renew/README.md
diff --git a/roles/webserver-tls-renew/handlers/main.yml b/roles/srv-web-tls-renew/handlers/main.yml
similarity index 69%
rename from roles/webserver-tls-renew/handlers/main.yml
rename to roles/srv-web-tls-renew/handlers/main.yml
index eb639937..11915424 100644
--- a/roles/webserver-tls-renew/handlers/main.yml
+++ b/roles/srv-web-tls-renew/handlers/main.yml
@@ -1,6 +1,6 @@
 - name: "reload certbot service"
   systemd:
-    name: webserver-tls-renew.cymais.service
+    name: srv-web-tls-renew.cymais.service
     state: reloaded
     enabled: yes
     daemon_reload: yes
diff --git a/roles/webserver-tls-renew/meta/main.yml b/roles/srv-web-tls-renew/meta/main.yml
similarity index 97%
rename from roles/webserver-tls-renew/meta/main.yml
rename to roles/srv-web-tls-renew/meta/main.yml
index 564842ab..375cbe75 100644
--- a/roles/webserver-tls-renew/meta/main.yml
+++ b/roles/srv-web-tls-renew/meta/main.yml
@@ -28,6 +28,6 @@ galaxy_info:
   documentation: "https://s.veen.world/cymais"
 dependencies:
   - gen-certbot
-  - webserver-core
+  - srv-web-core
   - alert-compose
   - cln-certs
diff --git a/roles/webserver-tls-renew/tasks/main.yml b/roles/srv-web-tls-renew/tasks/main.yml
similarity index 82%
rename from roles/webserver-tls-renew/tasks/main.yml
rename to roles/srv-web-tls-renew/tasks/main.yml
index f96f0d04..809d9380 100644
--- a/roles/webserver-tls-renew/tasks/main.yml
+++ b/roles/srv-web-tls-renew/tasks/main.yml
@@ -5,10 +5,10 @@
     state: present
   when: run_once_nginx_certbot is not defined
 
-- name: configure webserver-tls-renew.cymais.service
+- name: configure srv-web-tls-renew.cymais.service
   template: 
-    src:  webserver-tls-renew.service.j2
-    dest: /etc/systemd/system/webserver-tls-renew.cymais.service
+    src:  srv-web-tls-renew.service.j2
+    dest: /etc/systemd/system/srv-web-tls-renew.cymais.service
   notify: reload certbot service
   when: run_once_nginx_certbot is not defined
 
diff --git a/roles/webserver-tls-renew/templates/webserver-tls-renew.service.j2 b/roles/srv-web-tls-renew/templates/srv-web-tls-renew.service.j2
similarity index 100%
rename from roles/webserver-tls-renew/templates/webserver-tls-renew.service.j2
rename to roles/srv-web-tls-renew/templates/srv-web-tls-renew.service.j2
diff --git a/roles/web-app-akaunting/tasks/main.yml b/roles/web-app-akaunting/tasks/main.yml
index fec0e605..701001f9 100644
--- a/roles/web-app-akaunting/tasks/main.yml
+++ b/roles/web-app-akaunting/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-attendize/tasks/main.yml b/roles/web-app-attendize/tasks/main.yml
index 1df04a02..8596fbc1 100644
--- a/roles/web-app-attendize/tasks/main.yml
+++ b/roles/web-app-attendize/tasks/main.yml
@@ -5,7 +5,7 @@
 
 - name: "include role for {{application_id}} to receive certs & do modification routines"
   include_role:
-    name: webserver-composer
+    name: srv-web-composer
   vars:
     domain: "{{ item }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
@@ -15,7 +15,7 @@
     
 - name: configure {{domains | get_domain(application_id)}}.conf
   template: 
-    src: roles/webserver-proxy-core/templates/vhost/basic.conf.j2 
+    src: roles/srv-web-proxy-core/templates/vhost/basic.conf.j2 
     dest: "{{nginx.directories.http.servers}}{{domains | get_domain(application_id)}}.conf"
   notify: restart nginx
 
diff --git a/roles/web-app-baserow/tasks/main.yml b/roles/web-app-baserow/tasks/main.yml
index a5ee240f..3a3e7976 100644
--- a/roles/web-app-baserow/tasks/main.yml
+++ b/roles/web-app-baserow/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
\ No newline at end of file
diff --git a/roles/web-app-bigbluebutton/README.md b/roles/web-app-bigbluebutton/README.md
index 1a59718a..2d40ef19 100644
--- a/roles/web-app-bigbluebutton/README.md
+++ b/roles/web-app-bigbluebutton/README.md
@@ -35,7 +35,7 @@ By default, BigBlueButton is deployed with best-practice hardening, modular secr
 ## System Requirements
 
 - Arch Linux with Docker, Compose, and Nginx roles pre-installed
-- DNS and reverse proxy configuration using `webserver-proxy-core`
+- DNS and reverse proxy configuration using `srv-web-proxy-core`
 - Functional email system for Greenlight SMTP
 
 ## Important Resources
diff --git a/roles/web-app-bigbluebutton/tasks/main.yml b/roles/web-app-bigbluebutton/tasks/main.yml
index d8a63ec0..dc1f6ab9 100644
--- a/roles/web-app-bigbluebutton/tasks/main.yml
+++ b/roles/web-app-bigbluebutton/tasks/main.yml
@@ -17,9 +17,9 @@
     database_username:  "postgres"
     database_name:      ""                              # Multiple databases
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
 
 - name: pull docker repository
   git:
diff --git a/roles/web-app-bluesky/tasks/main.yml b/roles/web-app-bluesky/tasks/main.yml
index 46388b31..a7c5d342 100644
--- a/roles/web-app-bluesky/tasks/main.yml
+++ b/roles/web-app-bluesky/tasks/main.yml
@@ -2,9 +2,9 @@
   include_role: 
     name: docker-compose
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain: "{{ item.domain }}"
     http_port: "{{ item.http_port }}"
diff --git a/roles/web-app-collabora/templates/nginx.conf.j2 b/roles/web-app-collabora/templates/nginx.conf.j2
index 913e119b..e01a0c3e 100644
--- a/roles/web-app-collabora/templates/nginx.conf.j2
+++ b/roles/web-app-collabora/templates/nginx.conf.j2
@@ -3,13 +3,13 @@ server {
 
   {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/webserver-injector-core/templates/global.includes.conf.j2'%}
+  {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%}
   
-  {% include 'roles/webserver-proxy-core/templates/headers/content_security_policy.conf.j2' %}
+  {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %}
 
-  {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+  {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
 
   {% set location = '^~ /cool/' %}
   
-  {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+  {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
 }
\ No newline at end of file
diff --git a/roles/web-app-coturn/tasks/main.yml b/roles/web-app-coturn/tasks/main.yml
index 61682a38..8c4f0e87 100644
--- a/roles/web-app-coturn/tasks/main.yml
+++ b/roles/web-app-coturn/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-discourse/tasks/main.yml b/roles/web-app-discourse/tasks/main.yml
index a3826a26..0c8f6af1 100644
--- a/roles/web-app-discourse/tasks/main.yml
+++ b/roles/web-app-discourse/tasks/main.yml
@@ -12,9 +12,9 @@
     name: service-rdbms-central
   when: run_once_docker_discourse is not defined
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-elk/tasks/main.yml b/roles/web-app-elk/tasks/main.yml
index 6dbe3315..c4e591f7 100644
--- a/roles/web-app-elk/tasks/main.yml
+++ b/roles/web-app-elk/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-espocrm/tasks/main.yml b/roles/web-app-espocrm/tasks/main.yml
index 6f219b53..28016371 100644
--- a/roles/web-app-espocrm/tasks/main.yml
+++ b/roles/web-app-espocrm/tasks/main.yml
@@ -5,7 +5,7 @@
 
 - name: "Include setup for domain '{{ domain }}'"
   include_role: 
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     ws_path:              "/ws"
     ws_port:              "{{ ports.localhost.websocket[application_id] }}"
diff --git a/roles/web-app-friendica/tasks/main.yml b/roles/web-app-friendica/tasks/main.yml
index f78067ca..777b521b 100644
--- a/roles/web-app-friendica/tasks/main.yml
+++ b/roles/web-app-friendica/tasks/main.yml
@@ -14,9 +14,9 @@
   notify: docker compose up
   when: applications | is_feature_enabled('ldap',application_id)
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-funkwhale/tasks/main.yml b/roles/web-app-funkwhale/tasks/main.yml
index f8b92448..d0735771 100644
--- a/roles/web-app-funkwhale/tasks/main.yml
+++ b/roles/web-app-funkwhale/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-fusiondirectory/README.md b/roles/web-app-fusiondirectory/README.md
index d322a61c..3f5f06c1 100644
--- a/roles/web-app-fusiondirectory/README.md
+++ b/roles/web-app-fusiondirectory/README.md
@@ -9,7 +9,7 @@ This Ansible role deploys and configures [FusionDirectory](https://www.fusiondir
 - Loads and templating of FusionDirectory-specific variables  
 - Generates a `.env` file for the container environment  
 - Deploys the FusionDirectory container via Docker Compose  
-- Configures NGINX (via the `webserver-proxy-domain` role) to expose the service  
+- Configures NGINX (via the `srv-web-proxy-domain` role) to expose the service  
 - Integrates with your central LDAP server for authentication  
 
 ## Features
diff --git a/roles/web-app-fusiondirectory/tasks/main.yml b/roles/web-app-fusiondirectory/tasks/main.yml
index ac55bbde..6d164a63 100644
--- a/roles/web-app-fusiondirectory/tasks/main.yml
+++ b/roles/web-app-fusiondirectory/tasks/main.yml
@@ -2,9 +2,9 @@
   include_role: 
     name: docker-compose
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-gitea/tasks/main.yml b/roles/web-app-gitea/tasks/main.yml
index 1eba436f..cddebdee 100644
--- a/roles/web-app-gitea/tasks/main.yml
+++ b/roles/web-app-gitea/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-gitlab/tasks/main.yml b/roles/web-app-gitlab/tasks/main.yml
index 61682a38..8c4f0e87 100644
--- a/roles/web-app-gitlab/tasks/main.yml
+++ b/roles/web-app-gitlab/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-jenkins/meta/main.yml b/roles/web-app-jenkins/meta/main.yml
index b729a456..030bb7c5 100644
--- a/roles/web-app-jenkins/meta/main.yml
+++ b/roles/web-app-jenkins/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- webserver-proxy-core
+- srv-web-proxy-core
diff --git a/roles/web-app-jenkins/tasks/main.yml b/roles/web-app-jenkins/tasks/main.yml
index a2a3dcea..fd6a8f41 100644
--- a/roles/web-app-jenkins/tasks/main.yml
+++ b/roles/web-app-jenkins/tasks/main.yml
@@ -1,6 +1,6 @@
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-joomla/tasks/main.yml b/roles/web-app-joomla/tasks/main.yml
index 72268250..ce9ab348 100644
--- a/roles/web-app-joomla/tasks/main.yml
+++ b/roles/web-app-joomla/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-keycloak/tasks/main.yml b/roles/web-app-keycloak/tasks/main.yml
index 2d36a5bb..e7b67e90 100644
--- a/roles/web-app-keycloak/tasks/main.yml
+++ b/roles/web-app-keycloak/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-lam/tasks/main.yml b/roles/web-app-lam/tasks/main.yml
index ac55bbde..6d164a63 100644
--- a/roles/web-app-lam/tasks/main.yml
+++ b/roles/web-app-lam/tasks/main.yml
@@ -2,9 +2,9 @@
   include_role: 
     name: docker-compose
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-libretranslate/tasks/main.yml b/roles/web-app-libretranslate/tasks/main.yml
index 945d01ab..8be0da97 100644
--- a/roles/web-app-libretranslate/tasks/main.yml
+++ b/roles/web-app-libretranslate/tasks/main.yml
@@ -13,9 +13,9 @@
 
 
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-listmonk/tasks/main.yml b/roles/web-app-listmonk/tasks/main.yml
index e563a364..7ba7ec6f 100644
--- a/roles/web-app-listmonk/tasks/main.yml
+++ b/roles/web-app-listmonk/tasks/main.yml
@@ -12,9 +12,9 @@
       ""
       {% endif %}
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-mailu/tasks/main.yml b/roles/web-app-mailu/tasks/main.yml
index d03451a3..bcc597a4 100644
--- a/roles/web-app-mailu/tasks/main.yml
+++ b/roles/web-app-mailu/tasks/main.yml
@@ -4,18 +4,18 @@
     name: service-rdbms-central
   when: run_once_docker_mailu is not defined
 
-- name: "Include role webserver-proxy-domain for {{ application_id }}"
+- name: "Include role srv-web-proxy-domain for {{ application_id }}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain: "{{ domains | get_domain(application_id) }}"
     http_port: "{{ ports.localhost.http[application_id] }}"
     nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 31M;"
   when: run_once_docker_mailu is not defined
 
-- name: "Include the webserver-proxy-tls-deploy role"
+- name: "Include the srv-web-proxy-tls-deploy role"
   include_role:
-    name: webserver-proxy-tls-deploy
+    name: srv-web-proxy-tls-deploy
   when: run_once_docker_mailu is not defined
 
 - name: Flush docker service handlers
diff --git a/roles/web-app-mastodon/tasks/main.yml b/roles/web-app-mastodon/tasks/main.yml
index 9ac981e3..484375ad 100644
--- a/roles/web-app-mastodon/tasks/main.yml
+++ b/roles/web-app-mastodon/tasks/main.yml
@@ -5,7 +5,7 @@
 
 - name: "Include setup for domain '{{ domain }}'"
   include_role: 
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   loop: "{{ domains.mastodon }}"
   loop_control:
     loop_var: domain
diff --git a/roles/web-app-matomo/tasks/main.yml b/roles/web-app-matomo/tasks/main.yml
index ce5fe9fe..e330f4fd 100644
--- a/roles/web-app-matomo/tasks/main.yml
+++ b/roles/web-app-matomo/tasks/main.yml
@@ -4,9 +4,9 @@
     name: service-rdbms-central
   when: run_once_docker_matomo is not defined
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-matrix-deprecated/meta/main.yml b/roles/web-app-matrix-deprecated/meta/main.yml
index e25f447f..90f0b6ca 100644
--- a/roles/web-app-matrix-deprecated/meta/main.yml
+++ b/roles/web-app-matrix-deprecated/meta/main.yml
@@ -24,4 +24,4 @@ galaxy_info:
   logo:
     class: "fa-solid fa-satellite-dish"
 dependencies: 
-- webserver-proxy-core
+- srv-web-proxy-core
diff --git a/roles/web-app-matrix-deprecated/tasks/main.yml b/roles/web-app-matrix-deprecated/tasks/main.yml
index 1c59072d..8b733c4a 100644
--- a/roles/web-app-matrix-deprecated/tasks/main.yml
+++ b/roles/web-app-matrix-deprecated/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role: 
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   loop:
     - "{{domains.matrix.element}}"
     - "{{domains.matrix.synapse}}"
diff --git a/roles/web-app-matrix/tasks/main.yml b/roles/web-app-matrix/tasks/main.yml
index 11cce0b9..3ca7b277 100644
--- a/roles/web-app-matrix/tasks/main.yml
+++ b/roles/web-app-matrix/tasks/main.yml
@@ -14,7 +14,7 @@
 
 - name: "include role for {{application_id}} to receive certs & do modification routines"
   include_role:
-    name: webserver-composer
+    name: srv-web-composer
   vars:
     domain:     "{{domains.matrix.synapse}}"
     http_port:  "{{ports.localhost.http.synapse}}"
@@ -39,9 +39,9 @@
     http_port:  "{{ports.localhost.http.synapse}}"
   notify: restart nginx
         
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role: 
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:        
     domain:     "{{domains.matrix.element}}"
     http_port:  "{{ports.localhost.http.element}}"
diff --git a/roles/web-app-matrix/templates/nginx.conf.j2 b/roles/web-app-matrix/templates/nginx.conf.j2
index ef6db9cb..c802c4e9 100644
--- a/roles/web-app-matrix/templates/nginx.conf.j2
+++ b/roles/web-app-matrix/templates/nginx.conf.j2
@@ -11,6 +11,6 @@ server {
     listen 8448 ssl default_server;
     listen [::]:8448 ssl default_server;
 
-    {% include 'roles/webserver-injector-core/templates/global.includes.conf.j2'%}
-    {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+    {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%}
+    {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
 }
\ No newline at end of file
diff --git a/roles/web-app-mediawiki/tasks/main.yml b/roles/web-app-mediawiki/tasks/main.yml
index 795547a4..d1239a66 100644
--- a/roles/web-app-mediawiki/tasks/main.yml
+++ b/roles/web-app-mediawiki/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-mobilizon/tasks/main.yml b/roles/web-app-mobilizon/tasks/main.yml
index 41faf4b8..2f3790a2 100644
--- a/roles/web-app-mobilizon/tasks/main.yml
+++ b/roles/web-app-mobilizon/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-moodle/tasks/main.yml b/roles/web-app-moodle/tasks/main.yml
index a5c74356..cec2a8d6 100644
--- a/roles/web-app-moodle/tasks/main.yml
+++ b/roles/web-app-moodle/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-mybb/meta/main.yml b/roles/web-app-mybb/meta/main.yml
index f0f45083..90d616df 100644
--- a/roles/web-app-mybb/meta/main.yml
+++ b/roles/web-app-mybb/meta/main.yml
@@ -24,4 +24,4 @@ galaxy_info:
     - web-app-keycloak
     - web-app-mailu
 dependencies:
-  - webserver-proxy-core
\ No newline at end of file
+  - srv-web-proxy-core
\ No newline at end of file
diff --git a/roles/web-app-mybb/tasks/setup-domain.yml b/roles/web-app-mybb/tasks/setup-domain.yml
index 73674393..b2165246 100644
--- a/roles/web-app-mybb/tasks/setup-domain.yml
+++ b/roles/web-app-mybb/tasks/setup-domain.yml
@@ -1,12 +1,12 @@
 - name: "include role receive certbot certificate"
   include_role: 
-    name: webserver-tls-core
+    name: srv-web-tls-core
   vars:
     domain: "{{domains | get_domain(application_id)}}"
 
 - name: configure {{domains | get_domain(application_id)}}.conf
   template: 
-    src:  "roles/webserver-proxy-core/templates/vhost/basic.conf.j2" 
+    src:  "roles/srv-web-proxy-core/templates/vhost/basic.conf.j2" 
     dest: "{{nginx.directories.http.servers}}{{domains | get_domain(application_id)}}.conf"
   notify: restart nginx
   vars: 
diff --git a/roles/web-app-nextcloud/tasks/main.yml b/roles/web-app-nextcloud/tasks/main.yml
index ef35b031..82ffccf7 100644
--- a/roles/web-app-nextcloud/tasks/main.yml
+++ b/roles/web-app-nextcloud/tasks/main.yml
@@ -21,7 +21,7 @@
 
 - name: "include role for {{application_id}} to receive certs & do modification routines"
   include_role:
-    name: webserver-composer
+    name: srv-web-composer
 
 - name: create nextcloud nginx proxy configuration file
   template: 
diff --git a/roles/web-app-nextcloud/templates/nginx/host.conf.j2 b/roles/web-app-nextcloud/templates/nginx/host.conf.j2
index 1b01d4f2..aaf64d83 100644
--- a/roles/web-app-nextcloud/templates/nginx/host.conf.j2
+++ b/roles/web-app-nextcloud/templates/nginx/host.conf.j2
@@ -6,7 +6,7 @@ server
 
   {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/webserver-injector-core/templates/global.includes.conf.j2'%}
+  {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%}
   # Remove X-Powered-By, which is an information leak
   fastcgi_hide_header X-Powered-By;
 
@@ -18,7 +18,7 @@ server
   client_body_buffer_size 400M;
   fastcgi_buffers 64 4K;
 
-  {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2' %}
+  {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2' %}
 
   location ^~ /.well-known {
     rewrite ^/\.well-known/host-meta\.json  /public.php?service=host-meta-json  last;
diff --git a/roles/web-app-openproject/tasks/main.yml b/roles/web-app-openproject/tasks/main.yml
index 3c58e5fa..1d58aa87 100644
--- a/roles/web-app-openproject/tasks/main.yml
+++ b/roles/web-app-openproject/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-peertube/tasks/create-domains.yml b/roles/web-app-peertube/tasks/create-domains.yml
index 7d9af85c..491f3770 100644
--- a/roles/web-app-peertube/tasks/create-domains.yml
+++ b/roles/web-app-peertube/tasks/create-domains.yml
@@ -1,6 +1,6 @@
 - name: "include role for {{application_id}} to receive certs & do modification routines"
   include_role:
-    name: webserver-composer
+    name: srv-web-composer
 
 - name: configure {{domain}}.conf
   template: 
diff --git a/roles/web-app-peertube/templates/peertube.conf.j2 b/roles/web-app-peertube/templates/peertube.conf.j2
index 3c881d76..4a82e662 100644
--- a/roles/web-app-peertube/templates/peertube.conf.j2
+++ b/roles/web-app-peertube/templates/peertube.conf.j2
@@ -3,9 +3,9 @@ server {
 
   {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/webserver-injector-core/templates/global.includes.conf.j2'%}
+  {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%}
   
-  {% include 'roles/webserver-proxy-core/templates/headers/content_security_policy.conf.j2' %}
+  {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %}
   
   ##
   # Application
diff --git a/roles/web-app-pgadmin/tasks/main.yml b/roles/web-app-pgadmin/tasks/main.yml
index 2c997866..ddade973 100644
--- a/roles/web-app-pgadmin/tasks/main.yml
+++ b/roles/web-app-pgadmin/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role:
     name: docker-compose
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:     "{{ domains | get_domain(application_id) }}"
     http_port:  "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-phpldapadmin/tasks/main.yml b/roles/web-app-phpldapadmin/tasks/main.yml
index ac55bbde..6d164a63 100644
--- a/roles/web-app-phpldapadmin/tasks/main.yml
+++ b/roles/web-app-phpldapadmin/tasks/main.yml
@@ -2,9 +2,9 @@
   include_role: 
     name: docker-compose
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-phpmyadmin/tasks/main.yml b/roles/web-app-phpmyadmin/tasks/main.yml
index a40ed450..36e1022a 100644
--- a/roles/web-app-phpmyadmin/tasks/main.yml
+++ b/roles/web-app-phpmyadmin/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: docker-compose
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-pixelfed/tasks/main.yml b/roles/web-app-pixelfed/tasks/main.yml
index 61682a38..8c4f0e87 100644
--- a/roles/web-app-pixelfed/tasks/main.yml
+++ b/roles/web-app-pixelfed/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-portfolio/tasks/main.yml b/roles/web-app-portfolio/tasks/main.yml
index 2e5455a2..dd986cc0 100644
--- a/roles/web-app-portfolio/tasks/main.yml
+++ b/roles/web-app-portfolio/tasks/main.yml
@@ -5,9 +5,9 @@
     name: docker-compose
   when: run_once_docker_portfolio is not defined
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-presentation/tasks/main.yml b/roles/web-app-presentation/tasks/main.yml
index d2489e1a..21b00d16 100644
--- a/roles/web-app-presentation/tasks/main.yml
+++ b/roles/web-app-presentation/tasks/main.yml
@@ -18,9 +18,9 @@
   include_role: 
     name: docker-compose
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:     "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-pretix/tasks/main.yml b/roles/web-app-pretix/tasks/main.yml
index 1232fb22..b22f375c 100644
--- a/roles/web-app-pretix/tasks/main.yml
+++ b/roles/web-app-pretix/tasks/main.yml
@@ -13,9 +13,9 @@
 
 
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-simpleicons/tasks/main.yml b/roles/web-app-simpleicons/tasks/main.yml
index 1a887634..b1cf259e 100644
--- a/roles/web-app-simpleicons/tasks/main.yml
+++ b/roles/web-app-simpleicons/tasks/main.yml
@@ -4,9 +4,9 @@
     name: docker-compose
   when: run_once_docker_simpleicons is not defined
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-snipe-it/tasks/main.yml b/roles/web-app-snipe-it/tasks/main.yml
index 305070f4..23c91fa9 100644
--- a/roles/web-app-snipe-it/tasks/main.yml
+++ b/roles/web-app-snipe-it/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-sphinx/tasks/main.yml b/roles/web-app-sphinx/tasks/main.yml
index 7f133cf4..f5930484 100644
--- a/roles/web-app-sphinx/tasks/main.yml
+++ b/roles/web-app-sphinx/tasks/main.yml
@@ -15,9 +15,9 @@
   include_role: 
     name: docker-compose
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:     "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-syncope/tasks/main.yml b/roles/web-app-syncope/tasks/main.yml
index 5a1c0f72..1c7efca8 100644
--- a/roles/web-app-syncope/tasks/main.yml
+++ b/roles/web-app-syncope/tasks/main.yml
@@ -5,7 +5,7 @@
 
 - name: "include role for {{application_id}} to receive certs & do modification routines"
   include_role:
-    name: webserver-composer
+    name: srv-web-composer
 
 - name: configure {{domain}}.conf
   template: 
diff --git a/roles/web-app-syncope/templates/proxy.conf b/roles/web-app-syncope/templates/proxy.conf
index 29c4df3f..24f6a46a 100644
--- a/roles/web-app-syncope/templates/proxy.conf
+++ b/roles/web-app-syncope/templates/proxy.conf
@@ -6,7 +6,7 @@ server
     {% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%}
   {% endif %}
 
-  {% include 'roles/webserver-injector-core/templates/global.includes.conf.j2'%}
+  {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%}
   
   {% if nginx_docker_reverse_proxy_extra_configuration is defined %}
     {# Additional Domain Specific Configuration #}
@@ -17,6 +17,6 @@ server
 
   {% for path in syncope_paths.values() %}
     {% set location =  web_protocol ~ '://' ~ domains | get_domain(application_id) ~ '/' ~ path ~ '/' %}
-    {% include 'roles/webserver-proxy-core/templates/location/proxy_basic.conf.j2'%}
+    {% include 'roles/srv-web-proxy-core/templates/location/proxy_basic.conf.j2'%}
   {% endfor %}
 }
\ No newline at end of file
diff --git a/roles/web-app-taiga/README.md b/roles/web-app-taiga/README.md
index 8ddd6046..64fb480b 100644
--- a/roles/web-app-taiga/README.md
+++ b/roles/web-app-taiga/README.md
@@ -39,7 +39,7 @@ By using this role, teams can set up Taiga in minutes on Arch Linux systems —
     - [taiga-contrib-oidc-auth (official)](https://github.com/taigaio/taiga-contrib-oidc-auth)
 - 📨 **Email Backend:** Supports SMTP and console backends for development.
 - 🔁 **Async & Realtime Events:** Includes RabbitMQ and support for Taiga’s event system.
-- 🌐 **Reverse Proxy Ready:** Integrates with Nginx using the `webserver-proxy-domain` role.
+- 🌐 **Reverse Proxy Ready:** Integrates with Nginx using the `srv-web-proxy-domain` role.
 - 🧩 **Composable Design:** Integrates cleanly with other CyMaIS infrastructure roles.
 
 ---
diff --git a/roles/web-app-taiga/tasks/main.yml b/roles/web-app-taiga/tasks/main.yml
index ae5068fa..f5094638 100644
--- a/roles/web-app-taiga/tasks/main.yml
+++ b/roles/web-app-taiga/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-app-wordpress/tasks/main.yml b/roles/web-app-wordpress/tasks/main.yml
index 671b068c..bc002adc 100644
--- a/roles/web-app-wordpress/tasks/main.yml
+++ b/roles/web-app-wordpress/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
   
-- name: "Include role webserver-proxy-domain for {{ application_id }}"
+- name: "Include role srv-web-proxy-domain for {{ application_id }}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   loop: "{{ applications[application_id].domains.canonical }}"
   loop_control:
     loop_var: domain
diff --git a/roles/web-app-yourls/tasks/main.yml b/roles/web-app-yourls/tasks/main.yml
index bdabb3c8..6c19143b 100644
--- a/roles/web-app-yourls/tasks/main.yml
+++ b/roles/web-app-yourls/tasks/main.yml
@@ -3,9 +3,9 @@
   include_role: 
     name: service-rdbms-central
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-redirect-domains/README.md b/roles/web-redirect-domains/README.md
index cf426130..0e60682d 100644
--- a/roles/web-redirect-domains/README.md
+++ b/roles/web-redirect-domains/README.md
@@ -9,7 +9,7 @@ This Ansible role configures Nginx to perform 301 redirects from one domain to a
 
 ## Dependencies
 
-- `webserver-https`: A role for setting up HTTPS for Nginx
+- `srv-web-https`: A role for setting up HTTPS for Nginx
 - `letsencrypt`: A role for managing SSL certificates with Let's Encrypt
 
 ## Author Information
diff --git a/roles/web-redirect-domains/meta/main.yml b/roles/web-redirect-domains/meta/main.yml
index 7ab1df67..ffc2913f 100644
--- a/roles/web-redirect-domains/meta/main.yml
+++ b/roles/web-redirect-domains/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-- webserver-https
+- srv-web-https
diff --git a/roles/web-redirect-domains/tasks/redirect-domain.yml b/roles/web-redirect-domains/tasks/redirect-domain.yml
index 56ffba6f..ba27a1fc 100644
--- a/roles/web-redirect-domains/tasks/redirect-domain.yml
+++ b/roles/web-redirect-domains/tasks/redirect-domain.yml
@@ -1,6 +1,6 @@
 - name: "include task receive certbot certificate"
   include_role: 
-    name: webserver-tls-core
+    name: srv-web-tls-core
 
 - name: "Deploying NGINX redirect configuration for {{ domain }}"
   template:
diff --git a/roles/web-redirect-www/meta/main.yml b/roles/web-redirect-www/meta/main.yml
index 100b0755..db26d619 100644
--- a/roles/web-redirect-www/meta/main.yml
+++ b/roles/web-redirect-www/meta/main.yml
@@ -23,4 +23,4 @@ galaxy_info:
   issue_tracker_url: "https://s.veen.world/cymaisissues"
   documentation: "https://s.veen.world/cymais"
 dependencies:
-  - webserver-core
\ No newline at end of file
+  - srv-web-core
\ No newline at end of file
diff --git a/roles/web-service-files/meta/main.yml b/roles/web-service-files/meta/main.yml
index b3b9358b..4e5f18e1 100644
--- a/roles/web-service-files/meta/main.yml
+++ b/roles/web-service-files/meta/main.yml
@@ -26,5 +26,5 @@ galaxy_info:
   issue_tracker_url: "https://s.veen.world/cymaisissues"
   documentation: "https://s.veen.world/cymais"
 dependencies:
-  - webserver-https
+  - srv-web-https
   - gen-git
diff --git a/roles/web-service-files/tasks/main.yml b/roles/web-service-files/tasks/main.yml
index 57624212..d1ad5542 100644
--- a/roles/web-service-files/tasks/main.yml
+++ b/roles/web-service-files/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: "include role for {{application_id}} to receive certs & do modification routines"
   include_role:
-    name: webserver-composer
+    name: srv-web-composer
   vars:
     domain:     "{{ domains | get_domain(application_id) }}"
     http_port:  "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-service-files/templates/nginx.conf.j2 b/roles/web-service-files/templates/nginx.conf.j2
index df8b9343..5a9e0ed2 100644
--- a/roles/web-service-files/templates/nginx.conf.j2
+++ b/roles/web-service-files/templates/nginx.conf.j2
@@ -4,9 +4,9 @@ server
   
   {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/webserver-injector-core/templates/global.includes.conf.j2'%}
+  {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%}
 
-  {% include 'roles/webserver-proxy-core/templates/headers/content_security_policy.conf.j2' %}
+  {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %}
   charset utf-8;
   
   location /
diff --git a/roles/web-service-html/meta/main.yml b/roles/web-service-html/meta/main.yml
index 7bf86100..4e216a8b 100644
--- a/roles/web-service-html/meta/main.yml
+++ b/roles/web-service-html/meta/main.yml
@@ -27,5 +27,5 @@ galaxy_info:
   issue_tracker_url: "https://s.veen.world/cymaisissues"
   documentation: "https://s.veen.world/cymais"
 dependencies:
-  - webserver-https
+  - srv-web-https
   - gen-git
diff --git a/roles/web-service-html/tasks/main.yml b/roles/web-service-html/tasks/main.yml
index bbf77fd1..8f7ba7af 100644
--- a/roles/web-service-html/tasks/main.yml
+++ b/roles/web-service-html/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: "include role for {{application_id}} to receive certs & do modification routines"
   include_role:
-    name: webserver-composer
+    name: srv-web-composer
   vars:
     domain:     "{{domains | get_domain(application_id)}}"
     http_port:  "{{ ports.localhost.http[application_id] }}"
diff --git a/roles/web-service-html/templates/nginx.conf.j2 b/roles/web-service-html/templates/nginx.conf.j2
index 28e406cd..0cf6282a 100644
--- a/roles/web-service-html/templates/nginx.conf.j2
+++ b/roles/web-service-html/templates/nginx.conf.j2
@@ -4,9 +4,9 @@ server
   
   {% include 'roles/network-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/webserver-injector-core/templates/global.includes.conf.j2'%}
+  {% include 'roles/srv-web-injector-core/templates/global.includes.conf.j2'%}
 
-  {% include 'roles/webserver-proxy-core/templates/headers/content_security_policy.conf.j2' %}
+  {% include 'roles/srv-web-proxy-core/templates/headers/content_security_policy.conf.j2' %}
   charset utf-8;
   
   location /
diff --git a/roles/webserver-composer/tasks/main.yml b/roles/webserver-composer/tasks/main.yml
deleted file mode 100644
index 96aea1a1..00000000
--- a/roles/webserver-composer/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- name: "include role webserver-injector-core for {{domain}}"
-  include_role: 
-    name: webserver-injector-core
-
-- name: "include role webserver-tls-core for {{domain}}"
-  include_role: 
-    name: webserver-tls-core
\ No newline at end of file
diff --git a/roles/webserver-proxy-tls-deploy/handlers/main.yml b/roles/webserver-proxy-tls-deploy/handlers/main.yml
deleted file mode 100644
index e0ca253e..00000000
--- a/roles/webserver-proxy-tls-deploy/handlers/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: "restart webserver-proxy-tls-deploy.cymais.service"
-  systemd:
-    name:           webserver-proxy-tls-deploy.{{application_id}}.cymais.service
-    state:          restarted
-    enabled:        yes
-    daemon_reload:  yes
\ No newline at end of file
diff --git a/templates/roles/web-app/tasks/main.yml.j2 b/templates/roles/web-app/tasks/main.yml.j2
index 375abae2..4846951e 100644
--- a/templates/roles/web-app/tasks/main.yml.j2
+++ b/templates/roles/web-app/tasks/main.yml.j2
@@ -23,9 +23,9 @@
 
 {% raw %}
 
-- name: "include role webserver-proxy-domain for {{application_id}}"
+- name: "include role srv-web-proxy-domain for {{application_id}}"
   include_role:
-    name: webserver-proxy-domain
+    name: srv-web-proxy-domain
   vars:
     domain:   "{{ domains | get_domain(application_id) }}"
     http_port:   "{{ ports.localhost.http[application_id] }}"