diff --git a/roles/cmp-docker-proxy/tasks/main.yml b/roles/cmp-docker-proxy/tasks/main.yml
index ab4e38f7..e2ca9eb9 100644
--- a/roles/cmp-docker-proxy/tasks/main.yml
+++ b/roles/cmp-docker-proxy/tasks/main.yml
@@ -1,6 +1,6 @@
 # run_once_cmp_docker_proxy: deactivated
 
-# To load the proxy firs is just implemented due to some issues with BBB
+# To load the proxy first is just implemented due to some issues with BBB
 - name: "For '{{ application_id }}': include role srv-proxy-6-6-domain"
   include_role:
     name: srv-proxy-6-6-domain
diff --git a/roles/srv-web-7-4-core/tasks/main.yml b/roles/srv-web-7-4-core/tasks/main.yml
index a57d39dd..6c54e193 100644
--- a/roles/srv-web-7-4-core/tasks/main.yml
+++ b/roles/srv-web-7-4-core/tasks/main.yml
@@ -1,18 +1,10 @@
 ---
-
-- name: "Store 'application_id' : {{ application_id }}"
-  set_fact:
-    original_application_id: "{{ application_id }}"
-  when: run_once_srv_web_core is not defined
-
 - name: Include openresty
   include_role: 
     name: svc-prx-openresty
-  when: run_once_srv_web_core is not defined
-
-- name: "Restore 'application_id':\n Current: {{ application_id }}\n Restored: {{ original_application_id }}"
-  set_fact:
-    application_id: "{{ original_application_id }}"
+    public: false 
+    # Explicit set to guaranty that application_id will not be overwritten. 
+    # Should be anyhow the default case
   when: run_once_srv_web_core is not defined
 
 - name: "reset (if enabled)"
diff --git a/roles/web-app-matomo/vars/main.yml b/roles/web-app-matomo/vars/main.yml
index 4aec018b..45825d7d 100644
--- a/roles/web-app-matomo/vars/main.yml
+++ b/roles/web-app-matomo/vars/main.yml
@@ -1,6 +1,9 @@
 ---
+# General
 application_id:       "web-app-matomo"
 database_type:        "mariadb"
+
+# Matomo
 matomo_excluded_ips:  "{{ applications | get_app_conf(application_id, 'excluded_ips', True) }}"
 matomo_index_php_url: "{{ domains | get_url(application_id, web_protocol) }}/index.php"
 matomo_auth_token:    "{{ applications | get_app_conf(application_id, 'credentials.auth_token', True) }}"
diff --git a/roles/web-svc-simpleicons/tasks/main.yml b/roles/web-svc-simpleicons/tasks/main.yml
index ed5537c2..32d00086 100644
--- a/roles/web-svc-simpleicons/tasks/main.yml
+++ b/roles/web-svc-simpleicons/tasks/main.yml
@@ -10,7 +10,7 @@
     dest: "{{ item.target }}"
     mode: '0755'
   loop:
-    - { source: "server.js.j2",    target: "{{ simpleicons_host_server_file }}" }
+    - { source: "server.js.j2",     target: "{{ simpleicons_host_server_file }}" }
     - { source: "package.json.j2",  target: "{{ simpleicons_host_package_file }}" }
   notify:
     - docker compose up