diff --git a/admin-users/meta/main.yml b/admin-users/meta/main.yml
index 7779f782..006768d3 100644
--- a/admin-users/meta/main.yml
+++ b/admin-users/meta/main.yml
@@ -12,6 +12,7 @@ galaxy_info:
   - name: Debian
     versions:
     - jessie
+    - stretch
 
 dependencies: []
   # List your role dependencies here, one per line.
diff --git a/admin-users/tasks/main.yml b/admin-users/tasks/main.yml
index c7eeaf39..420c1427 100644
--- a/admin-users/tasks/main.yml
+++ b/admin-users/tasks/main.yml
@@ -1,5 +1,11 @@
 ---
 
+- fail:
+    msg: only compatible with Debian >= 8
+  when:
+  - ansible_distribution == "Debian"
+  - ansible_distribution_major_version | version_compare('8', '<')
+
 - debug:
     msg: "Warning: empty 'admin_users' variable, tasks will be skipped!"
   when: admin_users == {}
diff --git a/admin-users/tasks/sudo.yml b/admin-users/tasks/sudo.yml
index 347a7f34..2587e6d5 100644
--- a/admin-users/tasks/sudo.yml
+++ b/admin-users/tasks/sudo.yml
@@ -21,7 +21,6 @@
     replace: '\1,{{ user.name }}'
     validate: '/usr/sbin/visudo -cf %s'
   when:
-  - ansible_distribution == "Debian"
   - ansible_distribution_release == "jessie"
   - not copy_sudoers_evolinux.changed
 
diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml
index 8514d7f0..1cc27278 100644
--- a/evolinux-base/tasks/main.yml
+++ b/evolinux-base/tasks/main.yml
@@ -1,4 +1,11 @@
 ---
+
+- fail:
+    msg: only compatible with Debian >= 8
+  when:
+  - ansible_distribution == "Debian"
+  - ansible_distribution_major_version | version_compare('8', '<')
+
 - name: Hostname
   include: hostname.yml
   when: evolinux_hostname_include
diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml
index b8c6576a..8089e397 100644
--- a/evolinux-base/tasks/packages.yml
+++ b/evolinux-base/tasks/packages.yml
@@ -79,7 +79,6 @@
   - net-tools
   when:
   - evolinux_packages_stretch
-  - ansible_distribution == "Debian"
   - ansible_distribution_major_version | version_compare('9', '>=')
 
 - name: Customize logcheck recipient
@@ -111,7 +110,6 @@
   - { option: "which",   value: "both" }
   when:
   - evolinux_packages_listchanges
-  - ansible_distribution == "Debian"
   - ansible_distribution_release == "jessie"
 
 - meta: flush_handlers
diff --git a/evolinux-base/tasks/ssh.yml b/evolinux-base/tasks/ssh.yml
index b9cfd9e6..f337f3ed 100644
--- a/evolinux-base/tasks/ssh.yml
+++ b/evolinux-base/tasks/ssh.yml
@@ -75,8 +75,6 @@
     regexp: '^#?LogLevel [A-Z]+'
     replace: "LogLevel VERBOSE"
   notify: reload sshd
-  when:
-  - ansible_distribution == "Debian"
-  - ansible_distribution_major_version | version_compare('9', '>=')
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - meta: flush_handlers