diff --git a/cli/fix/move_unnecessary_dependencies.py b/cli/fix/move_unnecessary_dependencies.py
index bbcf8777..cbfaefcb 100644
--- a/cli/fix/move_unnecessary_dependencies.py
+++ b/cli/fix/move_unnecessary_dependencies.py
@@ -228,7 +228,7 @@ def parse_meta_dependencies(role_dir: str) -> List[str]:
 def sanitize_run_once_var(role_name: str) -> str:
     """
     Generate run_once variable name from role name.
-    Example: 'srv-web-7-7-inj-logout' -> 'run_once_srv_web_7_7_inj_logout'
+    Example: 'sys-srv-web-inj-logout' -> 'run_once_sys_srv_web_inj_logout'
     """
     return "run_once_" + role_name.replace("-", "_")
 
diff --git a/roles/srv-proxy-6-6-domain/README.md b/roles/srv-proxy-6-6-domain/README.md
index 92a49893..72d08be5 100644
--- a/roles/srv-proxy-6-6-domain/README.md
+++ b/roles/srv-proxy-6-6-domain/README.md
@@ -8,7 +8,7 @@ This role bootstraps **per-domain Nginx configuration**: it requests TLS certifi
 
 A higher-level orchestration wrapper, *srv-proxy-6-6-domain* ties together several lower-level roles:
 
-1. **`srv-web-7-7-inj-compose`** – applies global tweaks and includes.  
+1. **`sys-srv-web-inj-compose`** – applies global tweaks and includes.  
 2. **`srv-web-6-6-tls-core`** – obtains Let’s Encrypt certificates.  
 3. **Domain template deployment** – copies a Jinja2 vHost from *srv-proxy-7-4-core*.  
 4. **`web-app-oauth2-proxy`** *(optional)* – protects the site with OAuth2.
diff --git a/roles/srv-proxy-7-4-core/templates/location/html.conf.j2 b/roles/srv-proxy-7-4-core/templates/location/html.conf.j2
index aa6dcfa0..8b8e5d51 100644
--- a/roles/srv-proxy-7-4-core/templates/location/html.conf.j2
+++ b/roles/srv-proxy-7-4-core/templates/location/html.conf.j2
@@ -36,6 +36,6 @@ location {{location}}
 
   {% if proxy_lua_enabled %}
   proxy_set_header Accept-Encoding "";
-  {% include 'roles/srv-web-7-7-inj-compose/templates/location.lua.j2'%}
+  {% include 'roles/sys-srv-web-inj-compose/templates/location.lua.j2'%}
   {% endif %}
 }
\ No newline at end of file
diff --git a/roles/srv-proxy-7-4-core/templates/vhost/basic.conf.j2 b/roles/srv-proxy-7-4-core/templates/vhost/basic.conf.j2
index 1f1f2877..c1caccea 100644
--- a/roles/srv-proxy-7-4-core/templates/vhost/basic.conf.j2
+++ b/roles/srv-proxy-7-4-core/templates/vhost/basic.conf.j2
@@ -6,7 +6,7 @@ server
     {% include 'roles/web-app-oauth2-proxy/templates/endpoint.conf.j2'%}
   {% endif %}
 
-  {% include 'roles/srv-web-7-7-inj-compose/templates/server.conf.j2'%}
+  {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
   
   {% if proxy_extra_configuration is defined %}
     {# Additional Domain Specific Configuration #}
diff --git a/roles/srv-proxy-7-4-core/templates/vhost/ws_generic.conf.j2 b/roles/srv-proxy-7-4-core/templates/vhost/ws_generic.conf.j2
index 4dccbded..b1ad85aa 100644
--- a/roles/srv-proxy-7-4-core/templates/vhost/ws_generic.conf.j2
+++ b/roles/srv-proxy-7-4-core/templates/vhost/ws_generic.conf.j2
@@ -8,7 +8,7 @@ server {
 
   {% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/srv-web-7-7-inj-compose/templates/server.conf.j2' %}
+  {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2' %}
 
   client_max_body_size {{ client_max_body_size | default('100m') }};
   keepalive_timeout    70;
diff --git a/roles/srv-web-7-6-composer/README.md b/roles/srv-web-7-6-composer/README.md
index e00a08d2..22dca0a6 100644
--- a/roles/srv-web-7-6-composer/README.md
+++ b/roles/srv-web-7-6-composer/README.md
@@ -2,7 +2,7 @@
 
 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. **`srv-web-7-7-inj-compose`**
+1. **`sys-srv-web-inj-compose`**
    Injects global HTML snippets (CSS, Matomo tracking, iFrame notifier, custom JavaScript) into responses using Nginx `sub_filter`.
 2. **`srv-web-6-6-tls-core`**
    Handles issuing, renewing, and managing TLS certificates via ACME/Certbot.
diff --git a/roles/srv-web-7-6-composer/tasks/main.yml b/roles/srv-web-7-6-composer/tasks/main.yml
index fb2c9aea..4e7ef4bd 100644
--- a/roles/srv-web-7-6-composer/tasks/main.yml
+++ b/roles/srv-web-7-6-composer/tasks/main.yml
@@ -1,8 +1,8 @@
 # run_once_srv_web_7_6_composer: deactivated
 
-- name: "include role srv-web-7-7-inj-compose for '{{ domain }}'"
+- name: "include role sys-srv-web-inj-compose for '{{ domain }}'"
   include_role: 
-    name: srv-web-7-7-inj-compose
+    name: sys-srv-web-inj-compose
 
 - name: "include role srv-web-6-6-tls-core for '{{ domain }}'"
   include_role: 
diff --git a/roles/srv-web-7-7-inj-compose/README.md b/roles/sys-srv-web-inj-compose/README.md
similarity index 100%
rename from roles/srv-web-7-7-inj-compose/README.md
rename to roles/sys-srv-web-inj-compose/README.md
diff --git a/roles/srv-web-7-7-inj-compose/__init__.py b/roles/sys-srv-web-inj-compose/__init__.py
similarity index 100%
rename from roles/srv-web-7-7-inj-compose/__init__.py
rename to roles/sys-srv-web-inj-compose/__init__.py
diff --git a/roles/srv-web-7-7-inj-compose/filter_plugins/__init__.py b/roles/sys-srv-web-inj-compose/filter_plugins/__init__.py
similarity index 100%
rename from roles/srv-web-7-7-inj-compose/filter_plugins/__init__.py
rename to roles/sys-srv-web-inj-compose/filter_plugins/__init__.py
diff --git a/roles/srv-web-7-7-inj-compose/filter_plugins/inj_enabled.py b/roles/sys-srv-web-inj-compose/filter_plugins/inj_enabled.py
similarity index 94%
rename from roles/srv-web-7-7-inj-compose/filter_plugins/inj_enabled.py
rename to roles/sys-srv-web-inj-compose/filter_plugins/inj_enabled.py
index 1b9e6b1a..5b1b031a 100644
--- a/roles/srv-web-7-7-inj-compose/filter_plugins/inj_enabled.py
+++ b/roles/sys-srv-web-inj-compose/filter_plugins/inj_enabled.py
@@ -1,4 +1,4 @@
-# roles/srv-web-7-7-inj-compose/filter_plugins/inj_enabled.py
+# roles/sys-srv-web-inj-compose/filter_plugins/inj_enabled.py
 #
 # Usage in tasks:
 #   - set_fact:
diff --git a/roles/srv-web-7-7-inj-compose/meta/main.yml b/roles/sys-srv-web-inj-compose/meta/main.yml
similarity index 96%
rename from roles/srv-web-7-7-inj-compose/meta/main.yml
rename to roles/sys-srv-web-inj-compose/meta/main.yml
index 9d5faff9..3839faea 100644
--- a/roles/srv-web-7-7-inj-compose/meta/main.yml
+++ b/roles/sys-srv-web-inj-compose/meta/main.yml
@@ -14,7 +14,7 @@ galaxy_info:
   - theming
   repository: "https://s.infinito.nexus/code"
   issue_tracker_url: "https://s.infinito.nexus/issues"
-  documentation: "https://s.infinito.nexus/code/tree/main/roles/srv-web-7-7-inj-compose"
+  documentation: "https://s.infinito.nexus/code/tree/main/roles/sys-srv-web-inj-compose"
   min_ansible_version: "2.9"
   platforms:
   - name: Any
diff --git a/roles/srv-web-7-7-inj-compose/tasks/main.yml b/roles/sys-srv-web-inj-compose/tasks/main.yml
similarity index 85%
rename from roles/srv-web-7-7-inj-compose/tasks/main.yml
rename to roles/sys-srv-web-inj-compose/tasks/main.yml
index b5defe3c..f2b0150d 100644
--- a/roles/srv-web-7-7-inj-compose/tasks/main.yml
+++ b/roles/sys-srv-web-inj-compose/tasks/main.yml
@@ -8,11 +8,11 @@
       name: srv-web-7-4-core
     when: run_once_srv_web_7_4_core is not defined
   - include_tasks: utils/run_once.yml
-  when: run_once_srv_web_7_7_inj_compose is not defined
+  when: run_once_sys_srv_web_inj_compose is not defined
 
 - name: "Activate Portfolio iFrame notifier for '{{ domain }}'"
   include_role:
-    name:   srv-web-7-7-inj-desktop
+    name:   sys-srv-web-inj-desktop
     public: true # Vars used in templates
   when: inj_enabled.desktop
 
@@ -42,23 +42,23 @@
 
 - name: "Activate Corporate CSS for '{{ domain }}'"
   include_role:
-    name: srv-web-7-7-inj-css
+    name: sys-srv-web-inj-css
   when:
   - inj_enabled.css
-  - run_once_srv_web_7_7_inj_css is not defined
+  - run_once_sys_srv_web_inj_css is not defined
 
 - name: "Activate Matomo Tracking for '{{ domain }}'"
   include_role:
-    name: srv-web-7-7-inj-matomo
+    name: sys-srv-web-inj-matomo
   when: inj_enabled.matomo
 
 - name: "Activate Javascript for '{{ domain }}'"
   include_role:
-    name: srv-web-7-7-inj-javascript
+    name: sys-srv-web-inj-javascript
   when: inj_enabled.javascript
 
 - name: "Activate logout proxy for '{{ domain }}'"
   include_role:
-    name: srv-web-7-7-inj-logout
+    name: sys-srv-web-inj-logout
     public: true # Vars used in templates
   when: inj_enabled.logout
diff --git a/roles/srv-web-7-7-inj-compose/templates/location.lua.j2 b/roles/sys-srv-web-inj-compose/templates/location.lua.j2
similarity index 98%
rename from roles/srv-web-7-7-inj-compose/templates/location.lua.j2
rename to roles/sys-srv-web-inj-compose/templates/location.lua.j2
index 2a141b20..c924e600 100644
--- a/roles/srv-web-7-7-inj-compose/templates/location.lua.j2
+++ b/roles/sys-srv-web-inj-compose/templates/location.lua.j2
@@ -3,7 +3,7 @@
 {% if inj_enabled.get(f) -%}
 {{ list_name }}[#{{ list_name }} + 1] = [=[
   {%- include
-     'roles/srv-web-7-7-inj-' ~ f ~
+     'roles/sys-srv-web-inj-' ~ f ~
      '/templates/' ~
      ('head' if list_name == 'head_snippets' else 'body') ~
      '_sub.j2'
diff --git a/roles/srv-web-7-7-inj-compose/templates/server.conf.j2 b/roles/sys-srv-web-inj-compose/templates/server.conf.j2
similarity index 70%
rename from roles/srv-web-7-7-inj-compose/templates/server.conf.j2
rename to roles/sys-srv-web-inj-compose/templates/server.conf.j2
index 3ee7ac61..97fae282 100644
--- a/roles/srv-web-7-7-inj-compose/templates/server.conf.j2
+++ b/roles/sys-srv-web-inj-compose/templates/server.conf.j2
@@ -1,5 +1,5 @@
 {% if inj_enabled.css %}
-{% include 'roles/srv-web-7-7-inj-css/templates/location.conf.j2' %}
+{% include 'roles/sys-srv-web-inj-css/templates/location.conf.j2' %}
 {% endif %}
 
 {% if inj_enabled.logout %}
diff --git a/roles/srv-web-7-7-inj-compose/vars/main.yml b/roles/sys-srv-web-inj-compose/vars/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-compose/vars/main.yml
rename to roles/sys-srv-web-inj-compose/vars/main.yml
diff --git a/roles/srv-web-7-7-inj-css/README.md b/roles/sys-srv-web-inj-css/README.md
similarity index 100%
rename from roles/srv-web-7-7-inj-css/README.md
rename to roles/sys-srv-web-inj-css/README.md
diff --git a/roles/srv-web-7-7-inj-css/meta/main.yml b/roles/sys-srv-web-inj-css/meta/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-css/meta/main.yml
rename to roles/sys-srv-web-inj-css/meta/main.yml
diff --git a/roles/srv-web-7-7-inj-css/tasks/01_core.yml b/roles/sys-srv-web-inj-css/tasks/01_core.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-css/tasks/01_core.yml
rename to roles/sys-srv-web-inj-css/tasks/01_core.yml
diff --git a/roles/srv-web-7-7-inj-css/tasks/main.yml b/roles/sys-srv-web-inj-css/tasks/main.yml
similarity index 61%
rename from roles/srv-web-7-7-inj-css/tasks/main.yml
rename to roles/sys-srv-web-inj-css/tasks/main.yml
index 589da695..350826b7 100644
--- a/roles/srv-web-7-7-inj-css/tasks/main.yml
+++ b/roles/sys-srv-web-inj-css/tasks/main.yml
@@ -1,4 +1,4 @@
 - block:
     - include_tasks: 01_core.yml
     - include_tasks: utils/run_once.yml
-  when: run_once_srv_web_7_7_inj_css is not defined
\ No newline at end of file
+  when: run_once_sys_srv_web_inj_css is not defined
\ No newline at end of file
diff --git a/roles/srv-web-7-7-inj-css/templates/global.css.j2 b/roles/sys-srv-web-inj-css/templates/global.css.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-css/templates/global.css.j2
rename to roles/sys-srv-web-inj-css/templates/global.css.j2
diff --git a/roles/srv-web-7-7-inj-css/templates/head_sub.j2 b/roles/sys-srv-web-inj-css/templates/head_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-css/templates/head_sub.j2
rename to roles/sys-srv-web-inj-css/templates/head_sub.j2
diff --git a/roles/srv-web-7-7-inj-css/templates/location.conf.j2 b/roles/sys-srv-web-inj-css/templates/location.conf.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-css/templates/location.conf.j2
rename to roles/sys-srv-web-inj-css/templates/location.conf.j2
diff --git a/roles/srv-web-7-7-inj-css/vars/main.yml b/roles/sys-srv-web-inj-css/vars/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-css/vars/main.yml
rename to roles/sys-srv-web-inj-css/vars/main.yml
diff --git a/roles/srv-web-7-7-inj-desktop/README.md b/roles/sys-srv-web-inj-desktop/README.md
similarity index 100%
rename from roles/srv-web-7-7-inj-desktop/README.md
rename to roles/sys-srv-web-inj-desktop/README.md
diff --git a/roles/srv-web-7-7-inj-desktop/meta/main.yml b/roles/sys-srv-web-inj-desktop/meta/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-desktop/meta/main.yml
rename to roles/sys-srv-web-inj-desktop/meta/main.yml
diff --git a/roles/srv-web-7-7-inj-desktop/tasks/01_deploy.yml b/roles/sys-srv-web-inj-desktop/tasks/01_deploy.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-desktop/tasks/01_deploy.yml
rename to roles/sys-srv-web-inj-desktop/tasks/01_deploy.yml
diff --git a/roles/srv-web-7-7-inj-desktop/tasks/main.yml b/roles/sys-srv-web-inj-desktop/tasks/main.yml
similarity index 93%
rename from roles/srv-web-7-7-inj-desktop/tasks/main.yml
rename to roles/sys-srv-web-inj-desktop/tasks/main.yml
index 1bc35025..92fecdcd 100644
--- a/roles/srv-web-7-7-inj-desktop/tasks/main.yml
+++ b/roles/sys-srv-web-inj-desktop/tasks/main.yml
@@ -5,7 +5,7 @@
     when: run_once_srv_web_7_4_core is not defined
   - include_tasks: 01_deploy.yml
   - include_tasks: utils/run_once.yml
-  when: run_once_srv_web_7_7_inj_desktop is not defined
+  when: run_once_sys_srv_web_inj_desktop is not defined
 
 # --- Build tiny inline initializer (CSP-hashed) ---
 - name: "Load iFrame init code for '{{ application_id }}'"
diff --git a/roles/srv-web-7-7-inj-desktop/templates/body_sub.j2 b/roles/sys-srv-web-inj-desktop/templates/body_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-desktop/templates/body_sub.j2
rename to roles/sys-srv-web-inj-desktop/templates/body_sub.j2
diff --git a/roles/srv-web-7-7-inj-desktop/templates/head_sub.j2 b/roles/sys-srv-web-inj-desktop/templates/head_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-desktop/templates/head_sub.j2
rename to roles/sys-srv-web-inj-desktop/templates/head_sub.j2
diff --git a/roles/srv-web-7-7-inj-desktop/templates/iframe-handler.js.j2 b/roles/sys-srv-web-inj-desktop/templates/iframe-handler.js.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-desktop/templates/iframe-handler.js.j2
rename to roles/sys-srv-web-inj-desktop/templates/iframe-handler.js.j2
diff --git a/roles/srv-web-7-7-inj-desktop/templates/iframe-init_one_liner.js.j2 b/roles/sys-srv-web-inj-desktop/templates/iframe-init_one_liner.js.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-desktop/templates/iframe-init_one_liner.js.j2
rename to roles/sys-srv-web-inj-desktop/templates/iframe-init_one_liner.js.j2
diff --git a/roles/srv-web-7-7-inj-desktop/vars/main.yml b/roles/sys-srv-web-inj-desktop/vars/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-desktop/vars/main.yml
rename to roles/sys-srv-web-inj-desktop/vars/main.yml
diff --git a/roles/srv-web-7-7-inj-javascript/README.md b/roles/sys-srv-web-inj-javascript/README.md
similarity index 100%
rename from roles/srv-web-7-7-inj-javascript/README.md
rename to roles/sys-srv-web-inj-javascript/README.md
diff --git a/roles/srv-web-7-7-inj-javascript/meta/main.yml b/roles/sys-srv-web-inj-javascript/meta/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-javascript/meta/main.yml
rename to roles/sys-srv-web-inj-javascript/meta/main.yml
diff --git a/roles/srv-web-7-7-inj-javascript/tasks/main.yml b/roles/sys-srv-web-inj-javascript/tasks/main.yml
similarity index 92%
rename from roles/srv-web-7-7-inj-javascript/tasks/main.yml
rename to roles/sys-srv-web-inj-javascript/tasks/main.yml
index c7af22d0..e9f93e24 100644
--- a/roles/srv-web-7-7-inj-javascript/tasks/main.yml
+++ b/roles/sys-srv-web-inj-javascript/tasks/main.yml
@@ -5,7 +5,7 @@
       name: srv-web-7-4-core
     when: run_once_srv_web_7_4_core is not defined
   - include_tasks: utils/run_once.yml
-  when: run_once_srv_web_7_7_inj_javascript is not defined
+  when: run_once_sys_srv_web_inj_javascript is not defined
 
 - name: "Load JavaScript code for '{{ application_id }}'"
   set_fact:
diff --git a/roles/srv-web-7-7-inj-javascript/templates/head_sub.j2 b/roles/sys-srv-web-inj-javascript/templates/head_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-javascript/templates/head_sub.j2
rename to roles/sys-srv-web-inj-javascript/templates/head_sub.j2
diff --git a/roles/srv-web-7-7-inj-javascript/vars/main.yml b/roles/sys-srv-web-inj-javascript/vars/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-javascript/vars/main.yml
rename to roles/sys-srv-web-inj-javascript/vars/main.yml
diff --git a/roles/srv-web-7-7-inj-logout/README.md b/roles/sys-srv-web-inj-logout/README.md
similarity index 95%
rename from roles/srv-web-7-7-inj-logout/README.md
rename to roles/sys-srv-web-inj-logout/README.md
index 2c9dbf64..5698569f 100644
--- a/roles/srv-web-7-7-inj-logout/README.md
+++ b/roles/sys-srv-web-inj-logout/README.md
@@ -1,10 +1,10 @@
-# srv-web-7-7-inj-logout
+# sys-srv-web-inj-logout
 
 This role injects a catcher that intercepts all logout elements in HTML pages served by Nginx and redirects them to a centralized logout endpoint via JavaScript.
 
 ## Description
 
-The `srv-web-7-7-inj-logout` Ansible role automatically embeds a lightweight JavaScript snippet into your web application's HTML responses. This script identifies logout links, buttons, forms, and other elements, overrides their target URLs, and ensures users are redirected to a central OIDC logout endpoint, providing a consistent single sign‑out experience.
+The `sys-srv-web-inj-logout` Ansible role automatically embeds a lightweight JavaScript snippet into your web application's HTML responses. This script identifies logout links, buttons, forms, and other elements, overrides their target URLs, and ensures users are redirected to a central OIDC logout endpoint, providing a consistent single sign‑out experience.
 
 ## Overview
 
diff --git a/roles/srv-web-7-7-inj-logout/meta/main.yml b/roles/sys-srv-web-inj-logout/meta/main.yml
similarity index 92%
rename from roles/srv-web-7-7-inj-logout/meta/main.yml
rename to roles/sys-srv-web-inj-logout/meta/main.yml
index 55344525..dea58256 100644
--- a/roles/srv-web-7-7-inj-logout/meta/main.yml
+++ b/roles/sys-srv-web-inj-logout/meta/main.yml
@@ -1,6 +1,6 @@
 galaxy_info:
   author: "Kevin Veen‑Birkenbach"
-  role_name: "srv-web-7-7-inj-logout"
+  role_name: "sys-srv-web-inj-logout"
   description: >
     Injects a JavaScript snippet via Nginx sub_filter that intercepts all logout actions
     (links, buttons, forms) and redirects users to a centralized OIDC logout endpoint.
@@ -21,4 +21,4 @@ galaxy_info:
     Kevin Veen‑Birkenbach   Consulting & Coaching Solutions   https://www.veen.world
   repository: "https://s.infinito.nexus/code"
   issue_tracker_url: "https://s.infinito.nexus/issues"
-  documentation: "https://s.infinito.nexus/code/tree/main/roles/srv-web-7-7-inj-logout"
+  documentation: "https://s.infinito.nexus/code/tree/main/roles/sys-srv-web-inj-logout"
diff --git a/roles/srv-web-7-7-inj-logout/tasks/01_core.yml b/roles/sys-srv-web-inj-logout/tasks/01_core.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-logout/tasks/01_core.yml
rename to roles/sys-srv-web-inj-logout/tasks/01_core.yml
diff --git a/roles/srv-web-7-7-inj-logout/tasks/02_deploy.yml b/roles/sys-srv-web-inj-logout/tasks/02_deploy.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-logout/tasks/02_deploy.yml
rename to roles/sys-srv-web-inj-logout/tasks/02_deploy.yml
diff --git a/roles/srv-web-7-7-inj-logout/tasks/main.yml b/roles/sys-srv-web-inj-logout/tasks/main.yml
similarity index 85%
rename from roles/srv-web-7-7-inj-logout/tasks/main.yml
rename to roles/sys-srv-web-inj-logout/tasks/main.yml
index aa55e630..2285a67f 100644
--- a/roles/srv-web-7-7-inj-logout/tasks/main.yml
+++ b/roles/sys-srv-web-inj-logout/tasks/main.yml
@@ -1,8 +1,8 @@
 - block:
   - include_tasks: 01_core.yml
   - set_fact:
-      run_once_srv_web_7_7_inj_logout: true
-  when: run_once_srv_web_7_7_inj_logout is not defined
+      run_once_sys_srv_web_inj_logout: true
+  when: run_once_sys_srv_web_inj_logout is not defined
 
 - name: "Load logout code for '{{ application_id }}'"
   set_fact:
diff --git a/roles/srv-web-7-7-inj-logout/templates/body_sub.j2 b/roles/sys-srv-web-inj-logout/templates/body_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-logout/templates/body_sub.j2
rename to roles/sys-srv-web-inj-logout/templates/body_sub.j2
diff --git a/roles/srv-web-7-7-inj-logout/templates/head_sub.j2 b/roles/sys-srv-web-inj-logout/templates/head_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-logout/templates/head_sub.j2
rename to roles/sys-srv-web-inj-logout/templates/head_sub.j2
diff --git a/roles/srv-web-7-7-inj-logout/templates/logout.js.j2 b/roles/sys-srv-web-inj-logout/templates/logout.js.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-logout/templates/logout.js.j2
rename to roles/sys-srv-web-inj-logout/templates/logout.js.j2
diff --git a/roles/srv-web-7-7-inj-logout/templates/logout_one_liner.js.j2 b/roles/sys-srv-web-inj-logout/templates/logout_one_liner.js.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-logout/templates/logout_one_liner.js.j2
rename to roles/sys-srv-web-inj-logout/templates/logout_one_liner.js.j2
diff --git a/roles/srv-web-7-7-inj-logout/vars/main.yml b/roles/sys-srv-web-inj-logout/vars/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-logout/vars/main.yml
rename to roles/sys-srv-web-inj-logout/vars/main.yml
diff --git a/roles/srv-web-7-7-inj-matomo/README.md b/roles/sys-srv-web-inj-matomo/README.md
similarity index 100%
rename from roles/srv-web-7-7-inj-matomo/README.md
rename to roles/sys-srv-web-inj-matomo/README.md
diff --git a/roles/srv-web-7-7-inj-matomo/meta/main.yml b/roles/sys-srv-web-inj-matomo/meta/main.yml
similarity index 96%
rename from roles/srv-web-7-7-inj-matomo/meta/main.yml
rename to roles/sys-srv-web-inj-matomo/meta/main.yml
index 2b3a7d61..25e543fd 100644
--- a/roles/srv-web-7-7-inj-matomo/meta/main.yml
+++ b/roles/sys-srv-web-inj-matomo/meta/main.yml
@@ -13,7 +13,7 @@ galaxy_info:
   - analytics
   repository: "https://s.infinito.nexus/code"
   issue_tracker_url: "https://s.infinito.nexus/issues"
-  documentation: "https://s.infinito.nexus/code/tree/main/roles/srv-web-7-7-inj-matomo"
+  documentation: "https://s.infinito.nexus/code/tree/main/roles/sys-srv-web-inj-matomo"
   min_ansible_version: "2.9"
   platforms:
   - name: Any
diff --git a/roles/srv-web-7-7-inj-matomo/tasks/main.yml b/roles/sys-srv-web-inj-matomo/tasks/main.yml
similarity index 97%
rename from roles/srv-web-7-7-inj-matomo/tasks/main.yml
rename to roles/sys-srv-web-inj-matomo/tasks/main.yml
index 6e18c6ba..d9dc41d3 100644
--- a/roles/srv-web-7-7-inj-matomo/tasks/main.yml
+++ b/roles/sys-srv-web-inj-matomo/tasks/main.yml
@@ -4,7 +4,7 @@
       name: srv-web-7-4-core
     when: run_once_srv_web_7_4_core is not defined
   - include_tasks: utils/run_once.yml
-  when: run_once_srv_web_7_7_inj_matomo is not defined
+  when: run_once_sys_srv_web_inj_matomo is not defined
 
 - name: "Relevant variables for role: {{ role_path | basename }}"
   debug:
diff --git a/roles/srv-web-7-7-inj-matomo/templates/body_sub.j2 b/roles/sys-srv-web-inj-matomo/templates/body_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-matomo/templates/body_sub.j2
rename to roles/sys-srv-web-inj-matomo/templates/body_sub.j2
diff --git a/roles/srv-web-7-7-inj-matomo/templates/head_sub.j2 b/roles/sys-srv-web-inj-matomo/templates/head_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-matomo/templates/head_sub.j2
rename to roles/sys-srv-web-inj-matomo/templates/head_sub.j2
diff --git a/roles/srv-web-7-7-inj-matomo/templates/matomo-tracking.js.j2 b/roles/sys-srv-web-inj-matomo/templates/matomo-tracking.js.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-matomo/templates/matomo-tracking.js.j2
rename to roles/sys-srv-web-inj-matomo/templates/matomo-tracking.js.j2
diff --git a/roles/srv-web-7-7-inj-matomo/vars/main.yml b/roles/sys-srv-web-inj-matomo/vars/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-matomo/vars/main.yml
rename to roles/sys-srv-web-inj-matomo/vars/main.yml
diff --git a/roles/web-app-collabora/templates/nginx.conf.j2 b/roles/web-app-collabora/templates/nginx.conf.j2
index e814b903..fbf133c1 100644
--- a/roles/web-app-collabora/templates/nginx.conf.j2
+++ b/roles/web-app-collabora/templates/nginx.conf.j2
@@ -3,7 +3,7 @@ server {
 
   {% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/srv-web-7-7-inj-compose/templates/server.conf.j2'%}
+  {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
   
   {% include 'roles/srv-proxy-7-4-core/templates/headers/content_security_policy.conf.j2' %}
 
diff --git a/roles/web-app-matrix/templates/nginx.conf.j2 b/roles/web-app-matrix/templates/nginx.conf.j2
index 43cf066b..ac6dc86f 100644
--- a/roles/web-app-matrix/templates/nginx.conf.j2
+++ b/roles/web-app-matrix/templates/nginx.conf.j2
@@ -6,7 +6,7 @@ server {
     listen {{ FEDERATION_PORT }} ssl default_server;
     listen [::]:{{ FEDERATION_PORT }} ssl default_server;
 
-    {% include 'roles/srv-web-7-7-inj-compose/templates/server.conf.j2'%}
+    {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
 
     {% include 'roles/srv-proxy-7-4-core/templates/location/html.conf.j2' %}
 
diff --git a/roles/web-app-nextcloud/templates/nginx/host.conf.j2 b/roles/web-app-nextcloud/templates/nginx/host.conf.j2
index 6ff93c48..7cf082dc 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/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/srv-web-7-7-inj-compose/templates/server.conf.j2'%}
+  {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
 
   # Remove X-Powered-By, which is an information leak
   fastcgi_hide_header X-Powered-By;
diff --git a/roles/web-app-peertube/templates/peertube.conf.j2 b/roles/web-app-peertube/templates/peertube.conf.j2
index e4649c52..5f1e2808 100644
--- a/roles/web-app-peertube/templates/peertube.conf.j2
+++ b/roles/web-app-peertube/templates/peertube.conf.j2
@@ -3,7 +3,7 @@ server {
 
   {% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/srv-web-7-7-inj-compose/templates/server.conf.j2'%}
+  {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
   
   {% include 'roles/srv-proxy-7-4-core/templates/headers/content_security_policy.conf.j2' %}
   
diff --git a/roles/web-app-syncope/templates/proxy.conf b/roles/web-app-syncope/templates/proxy.conf
index 8f13e696..f0598404 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/srv-web-7-7-inj-compose/templates/server.conf.j2'%}
+  {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
   
   {% if proxy_extra_configuration is defined %}
     {# Additional Domain Specific Configuration #}
diff --git a/roles/web-svc-cdn/templates/nginx.conf.j2 b/roles/web-svc-cdn/templates/nginx.conf.j2
index ecd973a7..4092f5e5 100644
--- a/roles/web-svc-cdn/templates/nginx.conf.j2
+++ b/roles/web-svc-cdn/templates/nginx.conf.j2
@@ -4,7 +4,7 @@ server
   
   {% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/srv-web-7-7-inj-compose/templates/server.conf.j2'%}
+  {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
 
   {% include 'roles/srv-proxy-7-4-core/templates/headers/content_security_policy.conf.j2' %}
   
@@ -16,7 +16,7 @@ server
     autoindex on;                            {# Enable directory listing #}
     autoindex_exact_size off;                {# Display sizes in a human-readable format #}
     autoindex_localtime on;                  {# Show local time #}
-    {% include 'roles/srv-web-7-7-inj-compose/templates/location.lua.j2' %}
+    {% include 'roles/sys-srv-web-inj-compose/templates/location.lua.j2' %}
   }
 
   location /.well-known/ {
diff --git a/roles/web-svc-file/templates/nginx.conf.j2 b/roles/web-svc-file/templates/nginx.conf.j2
index a9c36d32..8c60172b 100644
--- a/roles/web-svc-file/templates/nginx.conf.j2
+++ b/roles/web-svc-file/templates/nginx.conf.j2
@@ -4,7 +4,7 @@ server
   
   {% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/srv-web-7-7-inj-compose/templates/server.conf.j2'%}
+  {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
 
   {% include 'roles/srv-proxy-7-4-core/templates/headers/content_security_policy.conf.j2' %}
   
@@ -16,7 +16,7 @@ server
     autoindex on;                            {# Enable directory listing #}
     autoindex_exact_size off;                {# Display sizes in a human-readable format #}
     autoindex_localtime on;                  {# Show local time #}
-    {% include 'roles/srv-web-7-7-inj-compose/templates/location.lua.j2' %}
+    {% include 'roles/sys-srv-web-inj-compose/templates/location.lua.j2' %}
   }
 
   location /.well-known/ {
diff --git a/roles/web-svc-html/templates/nginx.conf.j2 b/roles/web-svc-html/templates/nginx.conf.j2
index c4db40a4..5dcd3762 100644
--- a/roles/web-svc-html/templates/nginx.conf.j2
+++ b/roles/web-svc-html/templates/nginx.conf.j2
@@ -4,7 +4,7 @@ server
   
   {% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
 
-  {% include 'roles/srv-web-7-7-inj-compose/templates/server.conf.j2'%}
+  {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
 
   {% include 'roles/srv-proxy-7-4-core/templates/headers/content_security_policy.conf.j2' %}
   
@@ -14,7 +14,7 @@ server
   {
     root {{NGINX.DIRECTORIES.DATA.HTML}};
     index index.html index.htm;
-    {% include 'roles/srv-web-7-7-inj-compose/templates/location.lua.j2' %}
+    {% include 'roles/sys-srv-web-inj-compose/templates/location.lua.j2' %}
   }
 
   location /.well-known/ {
diff --git a/tests/unit/roles/srv-web-inj-compose/filter_plugins/test_inj_enabled.py b/tests/unit/roles/srv-web-inj-compose/filter_plugins/test_inj_enabled.py
index f73839b5..400d8ae0 100644
--- a/tests/unit/roles/srv-web-inj-compose/filter_plugins/test_inj_enabled.py
+++ b/tests/unit/roles/srv-web-inj-compose/filter_plugins/test_inj_enabled.py
@@ -8,7 +8,7 @@ import unittest
 THIS_FILE = Path(__file__)
 
 def find_repo_root(start: Path) -> Path:
-    target_rel = Path("roles") / "srv-web-7-7-inj-compose" / "filter_plugins" / "inj_enabled.py"
+    target_rel = Path("roles") / "sys-srv-web-inj-compose" / "filter_plugins" / "inj_enabled.py"
     cur = start
     for _ in range(12):
         if (cur / target_rel).is_file():
@@ -17,7 +17,7 @@ def find_repo_root(start: Path) -> Path:
     return start.parents[6]
 
 REPO_ROOT = find_repo_root(THIS_FILE)
-PLUGIN_PATH = REPO_ROOT / "roles" / "srv-web-7-7-inj-compose" / "filter_plugins" / "inj_enabled.py"
+PLUGIN_PATH = REPO_ROOT / "roles" / "sys-srv-web-inj-compose" / "filter_plugins" / "inj_enabled.py"
 
 # Ensure 'module_utils' is importable under its canonical package name
 if str(REPO_ROOT) not in sys.path: