diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml
index ccf1372b..fafe0a4e 100644
--- a/evolinux-base/tasks/main.yml
+++ b/evolinux-base/tasks/main.yml
@@ -1,10 +1,11 @@
 ---
 
-- name: "Compatibility check"
-  fail:
+- name: "System compatibility checks"
+  assert:
+    that:
+      - ansible_distribution == "Debian"
+      - ansible_distribution_major_version | version_compare('8', '>=')
     msg: only compatible with Debian >= 8
-  when:
-  - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<')
 
 - name: Apt configuration
   include_role:
diff --git a/evolinux-users/tasks/main.yml b/evolinux-users/tasks/main.yml
index a32bbd13..e5872a91 100644
--- a/evolinux-users/tasks/main.yml
+++ b/evolinux-users/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 
-- assert:
+- name: "System compatibility checks"
+  assert:
     that:
       - ansible_distribution == "Debian"
       - ansible_distribution_major_version | version_compare('8', '>=')