diff --git a/filter_plugins/csp_filters.py b/filter_plugins/csp_filters.py
index 1cf679d4..2c05a075 100644
--- a/filter_plugins/csp_filters.py
+++ b/filter_plugins/csp_filters.py
@@ -148,13 +148,13 @@ class FilterModule(object):
 
                 # Allow the loading of js from the cdn
                 if directive == 'script-src-elem':
-                    if self.is_feature_enabled(applications, 'logout', application_id) or self.is_feature_enabled(applications, 'port-ui-desktop', application_id):
+                    if self.is_feature_enabled(applications, 'logout', application_id) or self.is_feature_enabled(applications, 'desktop', application_id):
                         domain = domains.get('web-svc-cdn')[0]
                         tokens.append(f"{domain}")
 
                 if directive == 'frame-ancestors':
                     # Enable loading via ancestors
-                    if self.is_feature_enabled(applications, 'port-ui-desktop', application_id):
+                    if self.is_feature_enabled(applications, 'desktop', application_id):
                         domain = domains.get('web-app-port-ui')[0]
                         sld_tld = ".".join(domain.split(".")[-2:])  # yields "example.com"
                         tokens.append(f"{sld_tld}")                 # yields "*.example.com"
diff --git a/roles/srv-web-7-7-inj-compose/tasks/main.yml b/roles/srv-web-7-7-inj-compose/tasks/main.yml
index a988c6b9..70c64eda 100644
--- a/roles/srv-web-7-7-inj-compose/tasks/main.yml
+++ b/roles/srv-web-7-7-inj-compose/tasks/main.yml
@@ -13,11 +13,11 @@
       logout: "{{ (applications | get_app_conf(application_id, 'features.logout', False) or domain == PRIMARY_DOMAIN) }}"
       css: "{{ applications | get_app_conf(application_id, 'features.css', False) }}"
       matomo: "{{ applications | get_app_conf(application_id, 'features.matomo', False) }}"
-      port_ui: "{{ applications | get_app_conf(application_id, 'features.port-ui-desktop', False) }}"
+      port_ui: "{{ applications | get_app_conf(application_id, 'features.desktop', False) }}"
 
 - name: "Activate Portfolio iFrame notifier for {{ domain }}"
   include_role:
-    name:   srv-web-7-7-inj-port-ui-desktop
+    name:   srv-web-7-7-inj-desktop
     public: true # Expose variables so that they can be used in template
   when: inj_enabled.port_ui
 
@@ -48,7 +48,7 @@
       logout: "{{ (applications | get_app_conf(application_id, 'features.logout', False) or domain == PRIMARY_DOMAIN) }}"
       css: "{{ applications | get_app_conf(application_id, 'features.css', False) }}"
       matomo: "{{ applications | get_app_conf(application_id, 'features.matomo', False) }}"
-      port_ui: "{{ applications | get_app_conf(application_id, 'features.port-ui-desktop', False) }}"
+      port_ui: "{{ applications | get_app_conf(application_id, 'features.desktop', False) }}"
 
 - name: "Activate Corporate CSS for {{domain}}"
   include_role:
diff --git a/roles/srv-web-7-7-inj-compose/templates/location.lua.j2 b/roles/srv-web-7-7-inj-compose/templates/location.lua.j2
index 5707f28a..343948f6 100644
--- a/roles/srv-web-7-7-inj-compose/templates/location.lua.j2
+++ b/roles/srv-web-7-7-inj-compose/templates/location.lua.j2
@@ -43,7 +43,7 @@ body_filter_by_lua_block {
     -- build a list of head-injection snippets
     local head_snippets = {}
 
-    {% for head_feature in ['css', 'matomo', 'port-ui-desktop', 'javascript', 'logout' ] %}
+    {% for head_feature in ['css', 'matomo', 'desktop', 'javascript', 'logout' ] %}
     {% if applications | get_app_conf(application_id, 'features.' ~ head_feature, false) | bool %}
     head_snippets[#head_snippets + 1] = [=[
         {%- include "roles/srv-web-7-7-inj-" ~ head_feature ~ "/templates/head_sub.j2" -%}
@@ -58,7 +58,7 @@ body_filter_by_lua_block {
     -- build a list of body-injection snippets
     local body_snippets = {}
 
-    {% for body_feature in ['matomo', 'logout', 'port-ui-desktop'] %}
+    {% for body_feature in ['matomo', 'logout', 'desktop'] %}
     {% if applications | get_app_conf(application_id, 'features.' ~ body_feature, false) | bool %}
     body_snippets[#body_snippets + 1] = [=[
         {%- include "roles/srv-web-7-7-inj-" ~ body_feature ~ "/templates/body_sub.j2" -%}
diff --git a/roles/srv-web-7-7-inj-port-ui-desktop/README.md b/roles/srv-web-7-7-inj-desktop/README.md
similarity index 100%
rename from roles/srv-web-7-7-inj-port-ui-desktop/README.md
rename to roles/srv-web-7-7-inj-desktop/README.md
diff --git a/roles/srv-web-7-7-inj-port-ui-desktop/meta/main.yml b/roles/srv-web-7-7-inj-desktop/meta/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-port-ui-desktop/meta/main.yml
rename to roles/srv-web-7-7-inj-desktop/meta/main.yml
diff --git a/roles/srv-web-7-7-inj-port-ui-desktop/tasks/01_deploy.yml b/roles/srv-web-7-7-inj-desktop/tasks/01_deploy.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-port-ui-desktop/tasks/01_deploy.yml
rename to roles/srv-web-7-7-inj-desktop/tasks/01_deploy.yml
diff --git a/roles/srv-web-7-7-inj-port-ui-desktop/tasks/main.yml b/roles/srv-web-7-7-inj-desktop/tasks/main.yml
similarity index 92%
rename from roles/srv-web-7-7-inj-port-ui-desktop/tasks/main.yml
rename to roles/srv-web-7-7-inj-desktop/tasks/main.yml
index 8fb9db5b..901ffc70 100644
--- a/roles/srv-web-7-7-inj-port-ui-desktop/tasks/main.yml
+++ b/roles/srv-web-7-7-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_port_ui_desktop is not defined
+  when: run_once_srv_web_7_7_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-port-ui-desktop/templates/body_sub.j2 b/roles/srv-web-7-7-inj-desktop/templates/body_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-port-ui-desktop/templates/body_sub.j2
rename to roles/srv-web-7-7-inj-desktop/templates/body_sub.j2
diff --git a/roles/srv-web-7-7-inj-port-ui-desktop/templates/head_sub.j2 b/roles/srv-web-7-7-inj-desktop/templates/head_sub.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-port-ui-desktop/templates/head_sub.j2
rename to roles/srv-web-7-7-inj-desktop/templates/head_sub.j2
diff --git a/roles/srv-web-7-7-inj-port-ui-desktop/templates/iframe-handler.js.j2 b/roles/srv-web-7-7-inj-desktop/templates/iframe-handler.js.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-port-ui-desktop/templates/iframe-handler.js.j2
rename to roles/srv-web-7-7-inj-desktop/templates/iframe-handler.js.j2
diff --git a/roles/srv-web-7-7-inj-port-ui-desktop/templates/iframe-init_one_liner.js.j2 b/roles/srv-web-7-7-inj-desktop/templates/iframe-init_one_liner.js.j2
similarity index 100%
rename from roles/srv-web-7-7-inj-port-ui-desktop/templates/iframe-init_one_liner.js.j2
rename to roles/srv-web-7-7-inj-desktop/templates/iframe-init_one_liner.js.j2
diff --git a/roles/srv-web-7-7-inj-port-ui-desktop/vars/main.yml b/roles/srv-web-7-7-inj-desktop/vars/main.yml
similarity index 100%
rename from roles/srv-web-7-7-inj-port-ui-desktop/vars/main.yml
rename to roles/srv-web-7-7-inj-desktop/vars/main.yml
diff --git a/roles/web-app-akaunting/config/main.yml b/roles/web-app-akaunting/config/main.yml
index 453d6535..d55d72af 100644
--- a/roles/web-app-akaunting/config/main.yml
+++ b/roles/web-app-akaunting/config/main.yml
@@ -5,7 +5,7 @@ setup_admin_email:  "{{ users.administrator.email }}"
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  true
+  desktop:  true
   central_database: true
   logout:           true 
 server:
diff --git a/roles/web-app-attendize/config/main.yml b/roles/web-app-attendize/config/main.yml
index a006906d..c5489e0d 100644
--- a/roles/web-app-attendize/config/main.yml
+++ b/roles/web-app-attendize/config/main.yml
@@ -4,7 +4,7 @@ image:
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  true
+  desktop:  true
   central_database: true
   logout:           true
 docker:
diff --git a/roles/web-app-baserow/config/main.yml b/roles/web-app-baserow/config/main.yml
index df5754ab..6e0134d2 100644
--- a/roles/web-app-baserow/config/main.yml
+++ b/roles/web-app-baserow/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   central_database:   true
   logout:   true
 docker:
diff --git a/roles/web-app-bigbluebutton/config/main.yml b/roles/web-app-bigbluebutton/config/main.yml
index 835cab51..792b933c 100644
--- a/roles/web-app-bigbluebutton/config/main.yml
+++ b/roles/web-app-bigbluebutton/config/main.yml
@@ -3,7 +3,7 @@ api_suffix:           "/bigbluebutton/"
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    false # Videos can't open in frame due to iframe restrictions
+  desktop:    false # Videos can't open in frame due to iframe restrictions
                             # @todo fix this
   ldap:               false
   oidc:               true
diff --git a/roles/web-app-bluesky/config/main.yml b/roles/web-app-bluesky/config/main.yml
index bca2c8f7..e3d8bf4f 100644
--- a/roles/web-app-bluesky/config/main.yml
+++ b/roles/web-app-bluesky/config/main.yml
@@ -5,7 +5,7 @@ pds:
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  true
+  desktop:  true
   central_database: true
   logout:           true
 server:
diff --git a/roles/web-app-discourse/config/main.yml b/roles/web-app-discourse/config/main.yml
index 19fa30de..1826c7de 100644
--- a/roles/web-app-discourse/config/main.yml
+++ b/roles/web-app-discourse/config/main.yml
@@ -2,7 +2,7 @@ repository:           "discourse_repository"  # Name of the repository folder
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   oidc:               true
   central_database:   true
   ldap:               false         # @todo implement and activate
diff --git a/roles/web-app-espocrm/config/main.yml b/roles/web-app-espocrm/config/main.yml
index 1ea6bd59..825270c5 100644
--- a/roles/web-app-espocrm/config/main.yml
+++ b/roles/web-app-espocrm/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:    false # @todo Solve https://chatgpt.com/c/687a50b4-8d78-800f-a202-1631aa05fd4f before setting it to true
+  desktop:    false # @todo Solve https://chatgpt.com/c/687a50b4-8d78-800f-a202-1631aa05fd4f before setting it to true
   ldap:               false
   oidc:               true
   central_database:   true
diff --git a/roles/web-app-friendica/config/main.yml b/roles/web-app-friendica/config/main.yml
index c8c049ef..5c5047f8 100644
--- a/roles/web-app-friendica/config/main.yml
+++ b/roles/web-app-friendica/config/main.yml
@@ -3,7 +3,7 @@ images:
 features:
   matomo:             true
   css:                false # Temporary deactivated
-  port-ui-desktop:    true
+  desktop:    true
   oidc:               false # Implementation doesn't work yet
   central_database:   true
   ldap:               true
diff --git a/roles/web-app-funkwhale/config/main.yml b/roles/web-app-funkwhale/config/main.yml
index 065e6c79..b3ed9c20 100644
--- a/roles/web-app-funkwhale/config/main.yml
+++ b/roles/web-app-funkwhale/config/main.yml
@@ -15,7 +15,7 @@ docker:
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:    true
+  desktop:    true
   ldap:               true
   central_database:   true
   oauth2:             false # Doesn't make sense to activate it atm, because login is possible on homepage
diff --git a/roles/web-app-gitea/config/main.yml b/roles/web-app-gitea/config/main.yml
index 2a6e169c..8bb35906 100644
--- a/roles/web-app-gitea/config/main.yml
+++ b/roles/web-app-gitea/config/main.yml
@@ -7,7 +7,7 @@ configuration:
 features:
   matomo:                         true
   css:                            false
-  port-ui-desktop:                true
+  desktop:                true
   central_database:               true
   ldap:                           true
   oauth2:                         true
diff --git a/roles/web-app-gitlab/config/main.yml b/roles/web-app-gitlab/config/main.yml
index 6bd719da..2e050e0c 100644
--- a/roles/web-app-gitlab/config/main.yml
+++ b/roles/web-app-gitlab/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   central_database:   true
   logout:   true
 docker:
diff --git a/roles/web-app-joomla/config/main.yml b/roles/web-app-joomla/config/main.yml
index 3a246d1e..b13bbb1c 100644
--- a/roles/web-app-joomla/config/main.yml
+++ b/roles/web-app-joomla/config/main.yml
@@ -3,7 +3,7 @@ images:
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   central_database:   true
   logout:   true
 server:
diff --git a/roles/web-app-keycloak/config/main.yml b/roles/web-app-keycloak/config/main.yml
index 25be5752..d8436658 100644
--- a/roles/web-app-keycloak/config/main.yml
+++ b/roles/web-app-keycloak/config/main.yml
@@ -4,7 +4,7 @@ actions:
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   ldap:               true
   central_database:   true
   recaptcha:          true
diff --git a/roles/web-app-lam/config/main.yml b/roles/web-app-lam/config/main.yml
index 9e243cb1..1e97ce9a 100644
--- a/roles/web-app-lam/config/main.yml
+++ b/roles/web-app-lam/config/main.yml
@@ -11,7 +11,7 @@ oauth2_proxy:
 features:
   matomo:                       true
   css:                          true
-  port-ui-desktop:              true
+  desktop:              true
   ldap:                         true
   oauth2:                       true
   logout:                       true
diff --git a/roles/web-app-libretranslate/config/main.yml b/roles/web-app-libretranslate/config/main.yml
index 300d25fd..304361cf 100644
--- a/roles/web-app-libretranslate/config/main.yml
+++ b/roles/web-app-libretranslate/config/main.yml
@@ -11,7 +11,7 @@ docker:
 features:
   matomo:           true    # Enable Matomo Tracking
   css:              true    # Enable Global CSS Styling
-  port-ui-desktop: true    # Enable loading of app in iframe
+  desktop: true    # Enable loading of app in iframe
   ldap:             false   # Enable LDAP Network
   central_database: false   # Enable Central Database Network
   recaptcha:        false   # Enable ReCaptcha
diff --git a/roles/web-app-listmonk/config/main.yml b/roles/web-app-listmonk/config/main.yml
index ad5ffd28..196ec7b6 100644
--- a/roles/web-app-listmonk/config/main.yml
+++ b/roles/web-app-listmonk/config/main.yml
@@ -2,7 +2,7 @@ public_api_activated:       False                                 # Security hol
 features:
   matomo:                   true
   css:                      false
-  port-ui-desktop:          true
+  desktop:          true
   central_database:         true
   oidc:                     true
   logout:                   true
diff --git a/roles/web-app-mailu/config/main.yml b/roles/web-app-mailu/config/main.yml
index 9c4bfd8a..0a339c90 100644
--- a/roles/web-app-mailu/config/main.yml
+++ b/roles/web-app-mailu/config/main.yml
@@ -5,7 +5,7 @@ domain:                   "{{ PRIMARY_DOMAIN }}"  # The main domain from which m
 features:
   matomo:                 true
   css:                    false
-  port-ui-desktop:        true                    # Deactivated mailu iframe loading until keycloak supports it
+  desktop:        true                    # Deactivated mailu iframe loading until keycloak supports it
   oidc:                   true
   central_database:       false                   # Deactivate central database for mailu, I don't know why the database deactivation is necessary
   logout:                 true
diff --git a/roles/web-app-mastodon/config/main.yml b/roles/web-app-mastodon/config/main.yml
index fdf57286..320971f5 100644
--- a/roles/web-app-mastodon/config/main.yml
+++ b/roles/web-app-mastodon/config/main.yml
@@ -3,7 +3,7 @@ setup:                true                                            # Set true
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   oidc:               true
   central_database:   true
   logout:             true
diff --git a/roles/web-app-matomo/config/main.yml b/roles/web-app-matomo/config/main.yml
index 4cf09bf3..aadbb001 100644
--- a/roles/web-app-matomo/config/main.yml
+++ b/roles/web-app-matomo/config/main.yml
@@ -5,7 +5,7 @@ features:
   # itself wouldn't be possible 
   matomo:             false 
   css:                false
-  port-ui-desktop:    false  # Didn't work in frame didn't have high priority @todo figure out pcause and solve it
+  desktop:    false  # Didn't work in frame didn't have high priority @todo figure out pcause and solve it
   central_database:   true
   oauth2:             false
   logout:             false  # Dependency conflict. It requires CDN and CDN requires matomo
diff --git a/roles/web-app-matrix/config/main.yml b/roles/web-app-matrix/config/main.yml
index f2227c98..57315953 100644
--- a/roles/web-app-matrix/config/main.yml
+++ b/roles/web-app-matrix/config/main.yml
@@ -20,7 +20,7 @@ setup:                false                              # Set true in inventory
 features:
   matomo:             false                              # Deactivated, because in html CSP restricts use
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   oidc:               true                               # Deactivated OIDC due to this issue https://github.com/matrix-org/synapse/issues/10492
   central_database:   true
   logout:             true
diff --git a/roles/web-app-mig/config/main.yml b/roles/web-app-mig/config/main.yml
index b67241d9..a77d4f58 100644
--- a/roles/web-app-mig/config/main.yml
+++ b/roles/web-app-mig/config/main.yml
@@ -7,7 +7,7 @@ docker:
 features:
   matomo:             true  # activate tracking
   css:                true  # use custom infinito stile 
-  port-ui-desktop:    true  # Enable in port-ui
+  desktop:    true  # Enable in port-ui
   logout:             false
 server:
   csp:
diff --git a/roles/web-app-mobilizon/config/main.yml b/roles/web-app-mobilizon/config/main.yml
index fedfe363..535eeda8 100644
--- a/roles/web-app-mobilizon/config/main.yml
+++ b/roles/web-app-mobilizon/config/main.yml
@@ -3,7 +3,7 @@ features:
   central_database: true
   oidc:             true
   matomo:           true
-  port-ui-desktop:  true
+  desktop:  true
   logout:           true
 server:
   csp:
diff --git a/roles/web-app-moodle/config/main.yml b/roles/web-app-moodle/config/main.yml
index 76066bb0..6b0e019b 100644
--- a/roles/web-app-moodle/config/main.yml
+++ b/roles/web-app-moodle/config/main.yml
@@ -2,7 +2,7 @@ site_titel:           "Academy on {{PRIMARY_DOMAIN}}"
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:    true
+  desktop:    true
   central_database:   true
   oidc:               true
   logout:             true
diff --git a/roles/web-app-mybb/config/main.yml b/roles/web-app-mybb/config/main.yml
index 05c68ced..0294f958 100644
--- a/roles/web-app-mybb/config/main.yml
+++ b/roles/web-app-mybb/config/main.yml
@@ -2,7 +2,7 @@
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   central_database:   true
   logout:   true
 docker:
diff --git a/roles/web-app-navigator/config/main.yml b/roles/web-app-navigator/config/main.yml
index 2f875f68..f42cac77 100644
--- a/roles/web-app-navigator/config/main.yml
+++ b/roles/web-app-navigator/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  true
+  desktop:  true
   logout:           false
 server:
   csp:
diff --git a/roles/web-app-nextcloud/config/main.yml b/roles/web-app-nextcloud/config/main.yml
index 3e318822..524ccb86 100644
--- a/roles/web-app-nextcloud/config/main.yml
+++ b/roles/web-app-nextcloud/config/main.yml
@@ -56,7 +56,7 @@ oidc:
 features:
   matomo:                       true
   css:                          false
-  port-ui-desktop:              true
+  desktop:              true
   ldap:                         true
   oidc:                         true
   central_database:             true
diff --git a/roles/web-app-oauth2-proxy/config/main.yml b/roles/web-app-oauth2-proxy/config/main.yml
index 58294c8e..22ebb2f7 100644
--- a/roles/web-app-oauth2-proxy/config/main.yml
+++ b/roles/web-app-oauth2-proxy/config/main.yml
@@ -4,7 +4,7 @@ allowed_roles:      "admin"                     # Restrict it default to admin r
 features:
   matomo: true
   css: true
-  port-ui-desktop: false
+  desktop: false
   logout: true
 server:
   domains:
diff --git a/roles/web-app-openproject/config/main.yml b/roles/web-app-openproject/config/main.yml
index d88b0599..19752abe 100644
--- a/roles/web-app-openproject/config/main.yml
+++ b/roles/web-app-openproject/config/main.yml
@@ -13,7 +13,7 @@ ldap:
 features:
   matomo:             true
   css:                false   # Temporary deactivated. Needs to be optimized for production use.
-  port-ui-desktop:    true
+  desktop:    true
   ldap:               true
   central_database:   true
   oauth2:             true
diff --git a/roles/web-app-peertube/config/main.yml b/roles/web-app-peertube/config/main.yml
index 14986bf8..a8070bf8 100644
--- a/roles/web-app-peertube/config/main.yml
+++ b/roles/web-app-peertube/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:    true
+  desktop:    true
   central_database:   true
   oidc:               true
   logout:             true
diff --git a/roles/web-app-pgadmin/config/main.yml b/roles/web-app-pgadmin/config/main.yml
index 75f3cd88..abe2eb6c 100644
--- a/roles/web-app-pgadmin/config/main.yml
+++ b/roles/web-app-pgadmin/config/main.yml
@@ -9,7 +9,7 @@ oauth2_proxy:
 features:
   matomo:                 true
   css:                    true
-  port-ui-desktop:        true
+  desktop:        true
   central_database:       true
   oauth2:                 true
   logout:       true
diff --git a/roles/web-app-phpldapadmin/config/main.yml b/roles/web-app-phpldapadmin/config/main.yml
index d9cde459..147018e5 100644
--- a/roles/web-app-phpldapadmin/config/main.yml
+++ b/roles/web-app-phpldapadmin/config/main.yml
@@ -7,7 +7,7 @@ oauth2_proxy:
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   ldap:               true
   oauth2:             true
   logout:   true
diff --git a/roles/web-app-phpmyadmin/config/main.yml b/roles/web-app-phpmyadmin/config/main.yml
index c2e4db20..31befecb 100644
--- a/roles/web-app-phpmyadmin/config/main.yml
+++ b/roles/web-app-phpmyadmin/config/main.yml
@@ -7,7 +7,7 @@ oauth2_proxy:
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:    false   # Opens itself in a new window, when it's loaded in an iframe.
+  desktop:    false   # Opens itself in a new window, when it's loaded in an iframe.
                               # it's anyhow not so enduser relevant, so it can be kept like this
   central_database:   true
   oauth2:             true
diff --git a/roles/web-app-pixelfed/config/main.yml b/roles/web-app-pixelfed/config/main.yml
index 1e373430..49937a41 100644
--- a/roles/web-app-pixelfed/config/main.yml
+++ b/roles/web-app-pixelfed/config/main.yml
@@ -2,7 +2,7 @@ titel:                "Pictures on {{PRIMARY_DOMAIN}}"
 features:
   matomo:             true
   css:                false # Needs to be reactivated
-  port-ui-desktop:    true
+  desktop:    true
   central_database:   true
   oidc:               true
   logout:             true
diff --git a/roles/web-app-port-ui/config/main.yml b/roles/web-app-port-ui/config/main.yml
index 065bcb1f..b86ed083 100644
--- a/roles/web-app-port-ui/config/main.yml
+++ b/roles/web-app-port-ui/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  false
+  desktop:  false
   simpleicons:      true  # Activate Brand Icons for your groups
   javascript:       true  # Necessary for URL sync
   logout:           false # Doesn't have own user data. Just a frame.
diff --git a/roles/web-app-port-ui/lookup_plugins/docker_cards.py b/roles/web-app-port-ui/lookup_plugins/docker_cards.py
index 673d99f0..78221dde 100644
--- a/roles/web-app-port-ui/lookup_plugins/docker_cards.py
+++ b/roles/web-app-port-ui/lookup_plugins/docker_cards.py
@@ -22,7 +22,7 @@ class LookupModule(LookupBase):
           - Retrieves the icon class from galaxy_info.logo.class
           - Retrieves the tags from galaxy_info.galaxy_tags
           - Builds the URL using the 'domains' variable
-          - Sets the iframe flag from applications | get_app_conf(application_id, 'features.port-ui-desktop', True)
+          - Sets the iframe flag from applications | get_app_conf(application_id, 'features.desktop', True)
 
         Only cards whose application_id is included in the variable group_names are returned.
         """
@@ -109,7 +109,7 @@ class LookupModule(LookupBase):
             url = "https://" + domain_url if domain_url else ""
 
             app_data = applications.get(application_id, {})
-            iframe = app_data.get("features", {}).get("port-ui-desktop", False)
+            iframe = app_data.get("features", {}).get("desktop", False)
 
             # Build card dictionary
             card = {
diff --git a/roles/web-app-port-ui/tasks/02_validate.yml b/roles/web-app-port-ui/tasks/02_validate.yml
index 12c68b52..3ec46d9f 100644
--- a/roles/web-app-port-ui/tasks/02_validate.yml
+++ b/roles/web-app-port-ui/tasks/02_validate.yml
@@ -1,9 +1,9 @@
-- name: Assert that each web-app- or web-svc- port-ui-desktop app uses the correct domain suffix
+- name: Assert that each web-app- or web-svc- desktop app uses the correct domain suffix
   assert:
     that:
       - >
         (
-          not (item.value.features['port-ui-desktop'] | default(false) | bool)
+          not (item.value.features['desktop'] | default(false) | bool)
         )
         or (domains | get_domain(item.key)).endswith(domains | get_domain('web-app-port-ui'))
     fail_msg: >
diff --git a/roles/web-app-port-ui/templates/menu/applications.yml.j2 b/roles/web-app-port-ui/templates/menu/applications.yml.j2
index a9aac40f..2c3fdfc0 100644
--- a/roles/web-app-port-ui/templates/menu/applications.yml.j2
+++ b/roles/web-app-port-ui/templates/menu/applications.yml.j2
@@ -33,13 +33,13 @@ applications:
                 icon:
                   class: fa-solid fa-shield-halved
                 url: {{ keycloak_url }}/admin
-                iframe: {{ applications | get_app_conf( 'web-app-keycloak', 'features.port-ui-desktop', False) }}
+                iframe: {{ applications | get_app_conf( 'web-app-keycloak', 'features.desktop', False) }}
               - name: Profile
                 description: Update your personal admin settings
                 icon:
                   class: fa-solid fa-user-gear
                 url: {{ keycloak_url }}/realms/{{oidc.client.id}}/account
-                iframe: {{ applications | get_app_conf( 'web-app-keycloak', 'features.port-ui-desktop', False) }}
+                iframe: {{ applications | get_app_conf( 'web-app-keycloak', 'features.desktop', False) }}
               - name: Logout
                 description: End your admin session securely
                 icon:
diff --git a/roles/web-app-port-ui/templates/menu/followus.yml.j2 b/roles/web-app-port-ui/templates/menu/followus.yml.j2
index 0b7b7a96..3875f22b 100644
--- a/roles/web-app-port-ui/templates/menu/followus.yml.j2
+++ b/roles/web-app-port-ui/templates/menu/followus.yml.j2
@@ -12,7 +12,7 @@ followus:
         class: fa-brands fa-mastodon
       url: "{{ WEB_PROTOCOL }}://{{ service_provider.contact.mastodon.split('@')[2] }}/@{{ service_provider.contact.mastodon.split('@')[1] }}"
       identifier: "{{service_provider.contact.mastodon}}"
-      iframe: {{ applications | get_app_conf('web-app-mastodon','features.port-ui-desktop',True) }}
+      iframe: {{ applications | get_app_conf('web-app-mastodon','features.desktop',True) }}
 {% endif %}
 {% if service_provider.contact.bluesky is defined and service_provider.contact.bluesky != "" %}
     - name: Bluesky
@@ -31,7 +31,7 @@ followus:
           class: fa-solid fa-camera
       identifier: "{{service_provider.contact.pixelfed}}"
       url: "{{ WEB_PROTOCOL }}://{{ service_provider.contact.pixelfed.split('@')[2] }}/@{{ service_provider.contact.pixelfed.split('@')[1] }}"
-      iframe: {{ applications | get_app_conf('web-app-pixelfed','features.port-ui-desktop',True) }}
+      iframe: {{ applications | get_app_conf('web-app-pixelfed','features.desktop',True) }}
 {% endif %}
 {% if service_provider.contact.peertube  is defined and service_provider.contact.peertube  != "" %}
     - name: Peertube
@@ -40,7 +40,7 @@ followus:
         class: fa-solid fa-video
       identifier: "{{service_provider.contact.peertube}}"
       url: "{{ WEB_PROTOCOL }}://{{ service_provider.contact.peertube.split('@')[2] }}/@{{ service_provider.contact.peertube.split('@')[1] }}"
-      iframe: {{ applications | get_app_conf('web-app-peertube','features.port-ui-desktop',True) }}
+      iframe: {{ applications | get_app_conf('web-app-peertube','features.desktop',True) }}
 {% endif %}
 {% if service_provider.contact.wordpress is defined and service_provider.contact.wordpress != "" %}
     - name: Wordpress
@@ -49,7 +49,7 @@ followus:
         class: fa-solid fa-blog
       identifier: "{{service_provider.contact.wordpress}}"
       url: "{{ WEB_PROTOCOL }}://{{ service_provider.contact.wordpress.split('@')[2] }}/@{{ service_provider.contact.wordpress.split('@')[1] }}"
-      iframe: {{ applications | get_app_conf('web-app-wordpress','features.port-ui-desktop',True) }}
+      iframe: {{ applications | get_app_conf('web-app-wordpress','features.desktop',True) }}
 {% endif %}
 {% if service_provider.contact.friendica is defined and service_provider.contact.friendica != "" %}
     - name: Friendica
@@ -58,5 +58,5 @@ followus:
         class: fas fa-net-wired
       identifier: "{{service_provider.contact.friendica}}"
       url: "{{ WEB_PROTOCOL }}://{{ service_provider.contact.friendica.split('@')[2] }}/@{{ service_provider.contact.friendica.split('@')[1] }}"
-      iframe: {{ applications | get_app_conf('web-app-friendica','features.port-ui-desktop',True) }}
+      iframe: {{ applications | get_app_conf('web-app-friendica','features.desktop',True) }}
 {% endif %}
diff --git a/roles/web-app-port-ui/templates/menu/footer.yml.j2 b/roles/web-app-port-ui/templates/menu/footer.yml.j2
index ea131b3e..d697e7dc 100644
--- a/roles/web-app-port-ui/templates/menu/footer.yml.j2
+++ b/roles/web-app-port-ui/templates/menu/footer.yml.j2
@@ -10,7 +10,7 @@
       icon:
         class: fas fa-book
       url: https://{{domains | get_domain('web-app-sphinx')}}
-      iframe: {{ applications | get_app_conf('web-app-sphinx','features.port-ui-desktop',True) }}
+      iframe: {{ applications | get_app_conf('web-app-sphinx','features.desktop',True) }}
 
 {% endif %}
 
@@ -21,7 +21,7 @@
       icon:
         class: "fas fa-chalkboard-teacher"
       url: https://{{domains | get_domain('web-app-navigator')}}
-      iframe: {{ applications | get_app_conf('web-app-navigator','features.port-ui-desktop',True) }}
+      iframe: {{ applications | get_app_conf('web-app-navigator','features.desktop',True) }}
 
 {% endif %}
     - name: Solutions
diff --git a/roles/web-app-pretix/config/main.yml b/roles/web-app-pretix/config/main.yml
index bae548fb..14fffa9e 100644
--- a/roles/web-app-pretix/config/main.yml
+++ b/roles/web-app-pretix/config/main.yml
@@ -11,7 +11,7 @@ docker:
 features:
   matomo:           true    # Enable Matomo Tracking
   css:              true    # Enable Global CSS Styling
-  port-ui-desktop:  true    # Enable loading of app in iframe
+  desktop:  true    # Enable loading of app in iframe
   ldap:             false   # Enable LDAP Network
   central_database: false   # Enable Central Database Network
   recaptcha:        false   # Enable ReCaptcha
diff --git a/roles/web-app-snipe-it/config/main.yml b/roles/web-app-snipe-it/config/main.yml
index 33c76124..d4bb3e60 100644
--- a/roles/web-app-snipe-it/config/main.yml
+++ b/roles/web-app-snipe-it/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:    true
+  desktop:    true
   central_database:   true
   ldap:               true
   oauth2:             true
diff --git a/roles/web-app-sphinx/config/main.yml b/roles/web-app-sphinx/config/main.yml
index 047be3d6..c0219917 100644
--- a/roles/web-app-sphinx/config/main.yml
+++ b/roles/web-app-sphinx/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  true
+  desktop:  true
   logout:           false
 server:
   csp:
diff --git a/roles/web-app-taiga/config/main.yml b/roles/web-app-taiga/config/main.yml
index 11630171..d6f83e78 100644
--- a/roles/web-app-taiga/config/main.yml
+++ b/roles/web-app-taiga/config/main.yml
@@ -8,7 +8,7 @@ flavor:               'taigaio' # Potential flavors: robrotheram, taigaio
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:    true
+  desktop:    true
   oidc:               false
   central_database:   true
   logout:             true
diff --git a/roles/web-app-wordpress/config/main.yml b/roles/web-app-wordpress/config/main.yml
index 0b85d930..4719ebce 100644
--- a/roles/web-app-wordpress/config/main.yml
+++ b/roles/web-app-wordpress/config/main.yml
@@ -10,7 +10,7 @@ plugins:
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:    true
+  desktop:    true
   oidc:               true
   central_database:   true
   logout:             true
diff --git a/roles/web-app-yourls/config/main.yml b/roles/web-app-yourls/config/main.yml
index 3d26482d..1c1c8bf3 100644
--- a/roles/web-app-yourls/config/main.yml
+++ b/roles/web-app-yourls/config/main.yml
@@ -9,7 +9,7 @@ oauth2_proxy:
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:    true
+  desktop:    true
   central_database:   true
   oauth2:             true
   logout:             true
diff --git a/roles/web-svc-cdn/config/main.yml b/roles/web-svc-cdn/config/main.yml
index 7f720bf3..41f563bc 100644
--- a/roles/web-svc-cdn/config/main.yml
+++ b/roles/web-svc-cdn/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  false
+  desktop:  false
 server:
   domains:
     canonical:
diff --git a/roles/web-svc-file/config/main.yml b/roles/web-svc-file/config/main.yml
index fcce885c..0b215d89 100644
--- a/roles/web-svc-file/config/main.yml
+++ b/roles/web-svc-file/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  true
+  desktop:  true
 server:
   domains:
     canonical:
diff --git a/roles/web-svc-html/config/main.yml b/roles/web-svc-html/config/main.yml
index d41b1726..72cff04a 100644
--- a/roles/web-svc-html/config/main.yml
+++ b/roles/web-svc-html/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  true
+  desktop:  true
 server:
   domains:
     canonical:
diff --git a/roles/web-svc-logout/config/main.yml b/roles/web-svc-logout/config/main.yml
index 89e03f38..f8011655 100644
--- a/roles/web-svc-logout/config/main.yml
+++ b/roles/web-svc-logout/config/main.yml
@@ -1,7 +1,7 @@
 features:
   matomo:           true
   css:              true
-  port-ui-desktop:  true
+  desktop:  true
   javascript:       false
   logout:           false
 server:
diff --git a/roles/web-svc-simpleicons/config/main.yml b/roles/web-svc-simpleicons/config/main.yml
index 9ed9d871..5d6315c5 100644
--- a/roles/web-svc-simpleicons/config/main.yml
+++ b/roles/web-svc-simpleicons/config/main.yml
@@ -11,7 +11,7 @@ docker:
 features:
   matomo:           false   # Matomo tracking isn't necessary
   css:              true    # Enable Global CSS Styling
-  port-ui-desktop: true    # Enable loading of app in iframe
+  desktop: true    # Enable loading of app in iframe
   ldap:             false   # Enable LDAP Network
   central_database: false   # Enable Central Database Network
   recaptcha:        false   # Enable ReCaptcha
diff --git a/templates/roles/web-app/config/main.yml.j2 b/templates/roles/web-app/config/main.yml.j2
index 34aa2315..624b06c6 100644
--- a/templates/roles/web-app/config/main.yml.j2
+++ b/templates/roles/web-app/config/main.yml.j2
@@ -18,7 +18,7 @@ docker:
 features:
   matomo:           true    # Enable Matomo Tracking
   css:              true    # Enable Global CSS Styling
-  port-ui-desktop:  true    # Enable loading of app in iframe
+  desktop:  true    # Enable loading of app in iframe
   ldap:             false   # Enable LDAP Network
   central_database: false   # Enable Central Database Network
   recaptcha:        false   # Enable ReCaptcha
diff --git a/tests/unit/filter_plugins/test_csp_filters.py b/tests/unit/filter_plugins/test_csp_filters.py
index f2389d6e..2e0ad3bd 100644
--- a/tests/unit/filter_plugins/test_csp_filters.py
+++ b/tests/unit/filter_plugins/test_csp_filters.py
@@ -177,10 +177,10 @@ class TestCspFilters(unittest.TestCase):
     def test_build_csp_header_frame_ancestors(self):
         """
         frame-ancestors should include the wildcarded SLD+TLD when
-        'port-ui-desktop' is enabled, and omit it when disabled.
+        'desktop' is enabled, and omit it when disabled.
         """
         # Ensure feature enabled and domain set
-        self.apps['app1']['features']['port-ui-desktop'] = True
+        self.apps['app1']['features']['desktop'] = True
         # simulate a subdomain for the application
         self.domains['web-app-port-ui'] = ['domain-example.com']
         
@@ -192,7 +192,7 @@ class TestCspFilters(unittest.TestCase):
         )
 
         # Now disable the feature and rebuild
-        self.apps['app1']['features']['port-ui-desktop'] = False
+        self.apps['app1']['features']['desktop'] = False
         header_no = self.filter.build_csp_header(self.apps, 'app1', self.domains, web_protocol='https')
         # Should no longer contain the wildcarded sld.tld
         self.assertNotIn("*.domain-example.com", header_no)
diff --git a/tests/unit/lookup_plugins/test_docker_cards.py b/tests/unit/lookup_plugins/test_docker_cards.py
index b641b809..512d755d 100644
--- a/tests/unit/lookup_plugins/test_docker_cards.py
+++ b/tests/unit/lookup_plugins/test_docker_cards.py
@@ -57,7 +57,7 @@ galaxy_info:
             "applications": {
                 "portfolio": {
                     "features": {
-                        "port-ui-desktop": True
+                        "desktop": True
                     }
                 }
             },
@@ -90,7 +90,7 @@ galaxy_info:
             "applications": {
                 "portfolio": {
                     "features": {
-                        "port-ui-desktop": True
+                        "desktop": True
                     }
                 }
             },