diff --git a/roles/web-app-mastodon/tasks/00_core.yml b/roles/web-app-mastodon/tasks/00_core.yml
index 4e60f56b9b..acba89380f 100644
--- a/roles/web-app-mastodon/tasks/00_core.yml
+++ b/roles/web-app-mastodon/tasks/00_core.yml
@@ -1,13 +1,14 @@
 ---
 - include_tasks: utils/once/flag.yml
 
-- name: "📂 Include setup for domain '{{ domain }}'"
+- name: "📂 Include the front proxy for every {{ application_id }} domain"
   include_role:
     name: sys-stk-front-proxy
   loop: "{{ lookup('domains', 'web-app-mastodon') }}"
   loop_control:
-    loop_var: domain # nocheck: loop-var-shadow  sys-stk-front-proxy takes the vhost through this name, see its tasks/main.yml front_proxy_domain
+    loop_var: front_proxy_vhost
   vars:
+    domain: "{{ front_proxy_vhost }}"
     http_port: "{{ lookup('config', application_id, 'services.mastodon.ports.local.http') }}"
     webserver_websocket_location: "/api/v1/streaming"
     websocket_port: "{{ lookup('config', application_id, 'services.mastodon.ports.local.websocket') }}"
diff --git a/roles/web-app-peertube/tasks/00_core.yml b/roles/web-app-peertube/tasks/00_core.yml
index 20269f367b..004dc0774a 100644
--- a/roles/web-app-peertube/tasks/00_core.yml
+++ b/roles/web-app-peertube/tasks/00_core.yml
@@ -1,13 +1,14 @@
 ---
 - include_tasks: utils/once/flag.yml
 
-- name: "📂 Include front proxy for domain '{{ domain }}'"
+- name: "📂 Include the front proxy for every {{ application_id }} domain"
   include_role:
     name: sys-stk-front-proxy
   loop: "{{ lookup('domains', application_id) }}"
   loop_control:
-    loop_var: domain # nocheck: loop-var-shadow  sys-stk-front-proxy takes the vhost through this name, see its tasks/main.yml front_proxy_domain
+    loop_var: front_proxy_vhost
   vars:
+    domain: "{{ front_proxy_vhost }}"
     http_port: "{{ lookup('config', application_id, 'services.peertube.ports.local.http') }}"
     websocket_port: "{{ lookup('config', application_id, 'services.peertube.ports.local.http') }}"