diff --git a/roles/ynh_apps/tasks/app.yml b/roles/ynh_apps/tasks/app.yml
index f886170c790a21475c85b79d75b1ffacf872cdc5..cf7519b03c30b8628e2e5d7a9e0c46576fd74853 100644
--- a/roles/ynh_apps/tasks/app.yml
+++ b/roles/ynh_apps/tasks/app.yml
@@ -25,7 +25,6 @@
      --args "{% for key, value in ynh_app.args.items() %}{{ key }}={{ value }}{% if not loop.last %}&{% endif %}{% endfor %}"
   changed_when: False
   tags:
-    - yunohost
     - apps
 
 # Post-installation part
diff --git a/roles/ynh_apps/tasks/apps.yml b/roles/ynh_apps/tasks/apps.yml
index 0bac4731ee0342f448d755b80075b7af40559f69..9fb8e0e41381cccc8e3d8b8e28085e7a434ad32f 100644
--- a/roles/ynh_apps/tasks/apps.yml
+++ b/roles/ynh_apps/tasks/apps.yml
@@ -23,13 +23,11 @@
   register: ynh_installed_apps_raw
   changed_when: False
   tags:
-    - yunohost
     - apps
 
 - name: Format json of apps
   ansible.builtin.set_fact: ynh_installed_apps="{{ ynh_installed_apps_raw.stdout | from_json }}"
   tags:
-    - yunohost
     - apps
 
 - name: Install yunohost apps and perform post-install
@@ -39,5 +37,4 @@
     loop_var: ynh_app
   when: ynh_app.label not in ynh_installed_apps.values()
   tags:
-    - yunohost
     - apps
diff --git a/roles/ynh_apps/tasks/main.yml b/roles/ynh_apps/tasks/main.yml
index 289486ce2d189b0220af1569d7a72dfd82277d2f..e54dd7970d216c9bc6ca222c7e8937e88ec51c9b 100644
--- a/roles/ynh_apps/tasks/main.yml
+++ b/roles/ynh_apps/tasks/main.yml
@@ -22,5 +22,4 @@
   ansible.builtin.include_tasks: apps.yml
   when: ynh_apps
   tags:
-    - yunohost
     - apps
diff --git a/roles/ynh_config/tasks/autoupdate.yml b/roles/ynh_config/tasks/autoupdate.yml
index e66b57b77944fe9443760851b6d2da95c4f98c19..d840481909ce5987ae858cb6267335a264f2f676 100644
--- a/roles/ynh_config/tasks/autoupdate.yml
+++ b/roles/ynh_config/tasks/autoupdate.yml
@@ -26,6 +26,7 @@
     group: root
     mode: '0740'
   tags:
+    - yunohost
     - update
     - cron
 
@@ -38,5 +39,6 @@
     job: "{{ ynh_autoupdate.dest_script | default('/usr/local/bin/') }}ynh_autoupdate.sh"
     cron_file: ynh_autoupdate_cron
   tags:
+    - yunohost
     - update
     - cron
diff --git a/roles/ynh_config/tasks/main.yml b/roles/ynh_config/tasks/main.yml
index 052e0a2bfc36faff6821bc1a38750812ad43dba8..e9d1561d5dd32519af1171caa01c0c09417d786d 100644
--- a/roles/ynh_config/tasks/main.yml
+++ b/roles/ynh_config/tasks/main.yml
@@ -23,10 +23,12 @@
   loop: "{{ ynh_smtp_relay | dict2items }}"
   when: item.value
   tags:
+    - yunohost
     - smtp
 
 - name: Configures Yunohost autoupdate
   ansible.builtin.include_tasks: autoupdate.yml
   when: ynh_autoupdate.scheduled
   tags:
+    - yunohost
     - update
diff --git a/roles/ynh_config/tasks/smtp_relay.yml b/roles/ynh_config/tasks/smtp_relay.yml
index 5f956164ded22bfe8c552faa6526818208effb89..02de04358672e6840b2bbeb52700149191885069 100644
--- a/roles/ynh_config/tasks/smtp_relay.yml
+++ b/roles/ynh_config/tasks/smtp_relay.yml
@@ -24,6 +24,7 @@
   register: _ynh_smtp_current_values
   changed_when: False
   tags:
+    - yunohost
     - smtp
 
 - name: Set new SMTP settings
@@ -31,4 +32,5 @@
     "yunohost settings set smtp.relay.{{ item.key }} -v {{ item.value }}"
   when: _ynh_smtp_current_values.stdout != item.value
   tags:
+    - yunohost
     - smtp
diff --git a/roles/ynh_setup/tasks/main.yml b/roles/ynh_setup/tasks/main.yml
index bea97a1da7746176a4652a9ac9858c0522c427ba..0105337b106005f921b9528829f86ff80a608881 100644
--- a/roles/ynh_setup/tasks/main.yml
+++ b/roles/ynh_setup/tasks/main.yml
@@ -27,6 +27,7 @@
   tags:
     - pkg
     - linux
+    - yunohost
 
 - name: Create apps and config directories
   ansible.builtin.file:
@@ -38,6 +39,7 @@
     - "{{ ynh_symlink.conf_dir }}"
   tags:
     - linux
+    - yunohost
   when: ynh_symlink.enabled
 
 - name: Create symbolic link for Yunohost apps data directory
@@ -47,6 +49,7 @@
     state: link
   tags:
     - linux
+    - yunohost
   when: ynh_symlink.enabled
 
 - name: Create symbolic link for Yunohost configuration directory
@@ -56,6 +59,7 @@
     state: link
   tags:
     - linux
+    - yunohost
   when: ynh_symlink.enabled
 
 - name: Test if Yunohost is already installed