diff --git a/ansible/roles/prechecks/tasks/host_os_checks.yml b/ansible/roles/prechecks/tasks/host_os_checks.yml
index 2d1c96160e..6a1ae3fa11 100644
--- a/ansible/roles/prechecks/tasks/host_os_checks.yml
+++ b/ansible/roles/prechecks/tasks/host_os_checks.yml
@@ -1,22 +1,22 @@
 ---
 - name: Checking host OS distribution
-  fail:
-    msg: >-
+  assert:
+    that: ansible_facts.distribution in host_os_distributions
+    fail_msg: >-
       Host OS distribution {{ ansible_facts.distribution }} is not supported.
       Supported distributions are: {{ host_os_distributions.keys() | join(', ') }}
-  when: ansible_facts.distribution not in host_os_distributions
 
 - name: Checking host OS release or version
-  fail:
-    msg: >-
+  assert:
+    that:
+      - ansible_facts.distribution_release in host_os_distributions[ansible_facts.distribution] or
+        ansible_facts.distribution_version in host_os_distributions[ansible_facts.distribution] or
+        ansible_facts.distribution_major_version in host_os_distributions[ansible_facts.distribution]
+    fail_msg: >-
       {{ ansible_facts.distribution }} release {{ ansible_facts.distribution_release }}
       version {{ ansible_facts.distribution_version }} is not supported.
       Supported releases are:
       {{ host_os_distributions[ansible_facts.distribution] | join(', ') }}
-  when:
-    - ansible_facts.distribution_release not in host_os_distributions[ansible_facts.distribution]
-    - ansible_facts.distribution_version not in host_os_distributions[ansible_facts.distribution]
-    - ansible_facts.distribution_major_version not in host_os_distributions[ansible_facts.distribution]
 
 - name: Checking if CentOS is Stream
   become: true