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 93363f97..eba88d92 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
@@ -26,6 +26,10 @@ server {
 
   {% include 'roles/srv-proxy-7-4-core/templates/location/proxy_basic.conf.j2' %}
 
+  {% if applications | get_app_conf(application_id, 'features.universal_logout', False) or domain == primary_domain %}
+    {% include 'roles/web-svc-logout/templates/logout-proxy.conf.j2' %}
+  {% endif %}
+
   {% if ws_path is defined %}
     location {{ ws_path }} {
     proxy_set_header Host              $host;
diff --git a/roles/svc-db-openldap/handlers/main.yml b/roles/svc-db-openldap/handlers/main.yml
index e5a609c9..0b582caa 100644
--- a/roles/svc-db-openldap/handlers/main.yml
+++ b/roles/svc-db-openldap/handlers/main.yml
@@ -50,6 +50,6 @@
   changed_when: "'adding new entry' in ldapadd_result.stdout"
   failed_when: ldapadd_result.rc not in [0, 20, 68, 65]
   listen:
-    - "Import data LDIF files"
+    - "Import groups LDIF files"
     - "Import all LDIF files"
   loop: "{{ query('fileglob', role_path ~ '/templates/ldif/groups/*.j2') | sort }}"
\ No newline at end of file
diff --git a/roles/web-app-matrix/templates/nginx.conf.j2 b/roles/web-app-matrix/templates/nginx.conf.j2
index e8d53dd2..c35b1c4a 100644
--- a/roles/web-app-matrix/templates/nginx.conf.j2
+++ b/roles/web-app-matrix/templates/nginx.conf.j2
@@ -13,4 +13,9 @@ server {
 
     {% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
     {% include 'roles/srv-proxy-7-4-core/templates/location/proxy_basic.conf.j2' %}
+
+    {% if applications | get_app_conf(application_id, 'features.universal_logout', False) %}
+        {% include 'roles/web-svc-logout/templates/logout-proxy.conf.j2' %}
+    {% endif %}
+
 }
\ No newline at end of file
diff --git a/roles/web-app-nextcloud/templates/nginx/host.conf.j2 b/roles/web-app-nextcloud/templates/nginx/host.conf.j2
index f8272ef7..81d6d2e7 100644
--- a/roles/web-app-nextcloud/templates/nginx/host.conf.j2
+++ b/roles/web-app-nextcloud/templates/nginx/host.conf.j2
@@ -20,6 +20,10 @@ server
 
   {% include 'roles/srv-proxy-7-4-core/templates/location/proxy_basic.conf.j2' %}
 
+  {% if applications | get_app_conf(application_id, 'features.universal_logout', False) %}
+    {% include 'roles/web-svc-logout/templates/logout-proxy.conf.j2' %}
+  {% endif %}
+
   location ^~ /.well-known {
     rewrite ^/\.well-known/host-meta\.json  /public.php?service=host-meta-json  last;
     rewrite ^/\.well-known/host-meta        /public.php?service=host-meta       last;
diff --git a/roles/web-app-peertube/templates/peertube.conf.j2 b/roles/web-app-peertube/templates/peertube.conf.j2
index 68c589c3..a3f7a860 100644
--- a/roles/web-app-peertube/templates/peertube.conf.j2
+++ b/roles/web-app-peertube/templates/peertube.conf.j2
@@ -27,6 +27,10 @@ server {
     proxy_pass http://127.0.0.1:{{ports.localhost.http[application_id]}};
   }
 
+  {% if applications | get_app_conf(application_id, 'features.universal_logout', False) %}
+    {% include 'roles/web-svc-logout/templates/logout-proxy.conf.j2' %}
+  {% endif %}
+
   location / {
     try_files /dev/null @api;
   }