diff --git a/evolinux-users/tasks/main.yml b/evolinux-users/tasks/main.yml
index e5872a91..6ee9c512 100644
--- a/evolinux-users/tasks/main.yml
+++ b/evolinux-users/tasks/main.yml
@@ -20,9 +20,6 @@
 
 - name: Configure sudo
   include: sudo.yml
-  vars:
-    user: "{{ item.value }}"
-  with_dict: "{{ evolinux_users }}"
   when: evolinux_users != {}
 
 - name: Configure SSH
diff --git a/evolinux-users/tasks/sudo.yml b/evolinux-users/tasks/sudo.yml
index ed696b43..406cda0b 100644
--- a/evolinux-users/tasks/sudo.yml
+++ b/evolinux-users/tasks/sudo.yml
@@ -1,9 +1,34 @@
 ---
+- name: "Verify 'evolinux' sudoers file presence for debian jessie"
+  template:
+    src: "sudoers_jessie.j2"
+    dest: /etc/sudoers.d/evolinux
+    force: no
+    mode: "0440"
+    validate: '/usr/sbin/visudo -cf %s'
+  register: copy_sudoers_evolinux
+  when: ansible_distribution_release == "jessie"
+
+- name: "Verify 'evolinux' sudoers file presence for debian 9 or bigger"
+  template:
+    src: "sudoers_stretch.j2"
+    dest: /etc/sudoers.d/evolinux
+    force: no
+    mode: "0440"
+    validate: '/usr/sbin/visudo -cf %s'
+  register: copy_sudoers_evolinux
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - include: sudo_jessie.yml
+  vars:
+    user: "{{ item.value }}"
+  with_dict: "{{ evolinux_users }}"
   when: ansible_distribution_release == "jessie"
 
 - include: sudo_stretch.yml
+  vars:
+    user: "{{ item.value }}"
+  with_dict: "{{ evolinux_users }}"
   when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - meta: flush_handlers
diff --git a/evolinux-users/tasks/sudo_jessie.yml b/evolinux-users/tasks/sudo_jessie.yml
index f675954e..6f13541e 100644
--- a/evolinux-users/tasks/sudo_jessie.yml
+++ b/evolinux-users/tasks/sudo_jessie.yml
@@ -1,14 +1,5 @@
 ---
 
-- name: "Verify Evolinux sudoers file presence (jessie)"
-  template:
-    src: sudoers_jessie.j2
-    dest: /etc/sudoers.d/evolinux
-    force: no
-    mode: "0440"
-    validate: '/usr/sbin/visudo -cf %s'
-  register: copy_sudoers_evolinux
-
 - name: "Add user in sudoers file for '{{ user.name }}' (jessie)"
   replace:
     dest: /etc/sudoers.d/evolinux
diff --git a/evolinux-users/tasks/sudo_stretch.yml b/evolinux-users/tasks/sudo_stretch.yml
index dc744c56..ae18bce5 100644
--- a/evolinux-users/tasks/sudo_stretch.yml
+++ b/evolinux-users/tasks/sudo_stretch.yml
@@ -1,14 +1,5 @@
 ---
 
-- name: "Verify 'evolinux' sudoers file presence (Debian 9 or later)"
-  template:
-    src: sudoers_stretch.j2
-    dest: /etc/sudoers.d/evolinux
-    force: no
-    mode: "0440"
-    validate: '/usr/sbin/visudo -cf %s'
-  register: copy_sudoers_evolinux
-
 - name: "Create '{{ evolinux_sudo_group }}' group (Debian 9 or later)"
   group:
     name: "{{ evolinux_sudo_group }}"