diff --git a/roles/accounts/tasks/main.yml b/roles/accounts/tasks/main.yml
index 4ad4dc8..aba3180 100644
--- a/roles/accounts/tasks/main.yml
+++ b/roles/accounts/tasks/main.yml
@@ -17,7 +17,7 @@
   vars:
     user: "{{ item.value }}"
   with_dict: "{{ evolix_users }}"
-  when: 
+  when:
     - user.create == evobsd_users_create
     - evolix_users != {}
   tags:
diff --git a/roles/accounts/tasks/user.yml b/roles/accounts/tasks/user.yml
index 91ffa53..4d5c58d 100644
--- a/roles/accounts/tasks/user.yml
+++ b/roles/accounts/tasks/user.yml
@@ -26,6 +26,9 @@
 - name: "Gather available local users"
   getent:
     database: passwd
+  tags:
+    - accounts
+    - admin
 
 - name: "Home directory for '{{ user.name }}' is only accesible by owner"
   file:
diff --git a/roles/etc-git/tasks/commit.yml b/roles/etc-git/tasks/commit.yml
index 5fa020b..cacb66f 100644
--- a/roles/etc-git/tasks/commit.yml
+++ b/roles/etc-git/tasks/commit.yml
@@ -8,4 +8,5 @@
     - "'CHANGED:' in _ansible_commit.stdout"
   ignore_errors: true
   register: _ansible_commit
-  tags: always
+  tags:
+    - always
diff --git a/roles/evobackup/tasks/main.yml b/roles/evobackup/tasks/main.yml
index 2a12fd4..ce02337 100644
--- a/roles/evobackup/tasks/main.yml
+++ b/roles/evobackup/tasks/main.yml
@@ -1,3 +1,4 @@
+# yamllint disable rule:line-length
 ---
 # Info : old zzz_evobackup used sh, and since "sh" match "bash", we keep "sh" for regex commands
 
diff --git a/roles/evocheck/tasks/exec.yml b/roles/evocheck/tasks/exec.yml
index 05eb750..82eb942 100644
--- a/roles/evocheck/tasks/exec.yml
+++ b/roles/evocheck/tasks/exec.yml
@@ -5,7 +5,11 @@
   changed_when: false
   failed_when: false
   check_mode: false
+  tags:
+    - evocheck-exec
 
 - debug:
     var: evocheck_run.stdout_lines
   when: evocheck_run.stdout | length != 0
+  tags:
+    - evocheck-exec
diff --git a/roles/logsentry/tasks/main.yml b/roles/logsentry/tasks/main.yml
index 5220c02..db9a021 100644
--- a/roles/logsentry/tasks/main.yml
+++ b/roles/logsentry/tasks/main.yml
@@ -35,6 +35,8 @@
   file:
     state: absent
     path: /etc/logsentry/logsentry.sh
+  tags:
+    - logsentry
 
 - name: "Hourly cron job for logsentry.sh is installed"
   cron: