diff --git a/evolinux-users/tasks/sudo_jessie.yml b/evolinux-users/tasks/sudo_jessie.yml
index fd854c1f..f675954e 100644
--- a/evolinux-users/tasks/sudo_jessie.yml
+++ b/evolinux-users/tasks/sudo_jessie.yml
@@ -8,7 +8,6 @@
     mode: "0440"
     validate: '/usr/sbin/visudo -cf %s'
   register: copy_sudoers_evolinux
-  when: ansible_distribution_release == "jessie"
 
 - name: "Add user in sudoers file for '{{ user.name }}' (jessie)"
   replace:
@@ -16,6 +15,4 @@
     regexp: '^(User_Alias\s+ADMINS\s+=((?!{{ user.name }}).)*)$'
     replace: '\1,{{ user.name }}'
     validate: '/usr/sbin/visudo -cf %s'
-  when:
-  - ansible_distribution_release == "jessie"
-  - not copy_sudoers_evolinux.changed
+  when: not copy_sudoers_evolinux.changed
diff --git a/evolinux-users/tasks/sudo_stretch.yml b/evolinux-users/tasks/sudo_stretch.yml
index 7358fbf1..f77ae484 100644
--- a/evolinux-users/tasks/sudo_stretch.yml
+++ b/evolinux-users/tasks/sudo_stretch.yml
@@ -7,17 +7,14 @@
     force: no
     validate: '/usr/sbin/visudo -cf %s'
   register: copy_sudoers_evolinux
-  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - name: "Create evolinux-sudo group (Debian 9 or later)"
   group:
     name: "{{ evolinux_sudo_group }}"
     system: yes
-  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - name: "Add user to evolinux-sudo group (Debian 9 or later)"
   user:
     name: '{{ user.name }}'
     groups: "{{ evolinux_sudo_group }}"
     append: yes
-  when: ansible_distribution_major_version | version_compare('9', '>=')