diff --git a/defaults/main.yml b/defaults/main.yml
index 7e68264..5126395 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -25,8 +25,8 @@ __pam_pwd_rh_distros:
 __pam_pwd_rh_distros_fedora: "{{ __pam_pwd_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__pam_pwd_is_rh_distro: "{{ ansible_distribution in __pam_pwd_rh_distros }}"
+__pam_pwd_is_rh_distro: "{{ ansible_facts['distribution'] in __pam_pwd_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__pam_pwd_is_rh_distro_fedora: "{{ ansible_distribution in __pam_pwd_rh_distros_fedora }}"
+__pam_pwd_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __pam_pwd_rh_distros_fedora }}"
 # END - DO NOT EDIT THIS BLOCK - rh distros variables
diff --git a/tests/tests_include_vars_from_parent.yml b/tests/tests_include_vars_from_parent.yml
index 99565e0..539aa46 100644
--- a/tests/tests_include_vars_from_parent.yml
+++ b/tests/tests_include_vars_from_parent.yml
@@ -30,10 +30,10 @@
         # create all variants like CentOS, CentOS_8.1, CentOS-8.1,
         # CentOS-8, CentOS-8.1
         # more formally:
-        # {{ ansible_distribution }}-{{ ansible_distribution_version }}
-        # {{ ansible_distribution }}-{{ ansible_distribution_major_version }}
-        # {{ ansible_distribution }}
-        # {{ ansible_os_family }}
+        # {{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}
+        # {{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}
+        # {{ ansible_facts['distribution'] }}
+        # {{ ansible_facts['os_family'] }}
         # and the same for _ as separator.
         varfiles: "{{ [facts['distribution']] | product(separators) |
           map('join') | product(versions) | map('join') | list +
diff --git a/tests/vars/rh_distros_vars.yml b/tests/vars/rh_distros_vars.yml
index dec17ff..1480bed 100644
--- a/tests/vars/rh_distros_vars.yml
+++ b/tests/vars/rh_distros_vars.yml
@@ -14,7 +14,7 @@ __pam_pwd_rh_distros:
 __pam_pwd_rh_distros_fedora: "{{ __pam_pwd_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__pam_pwd_is_rh_distro: "{{ ansible_distribution in __pam_pwd_rh_distros }}"
+__pam_pwd_is_rh_distro: "{{ ansible_facts['distribution'] in __pam_pwd_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__pam_pwd_is_rh_distro_fedora: "{{ ansible_distribution in __pam_pwd_rh_distros_fedora }}"
+__pam_pwd_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __pam_pwd_rh_distros_fedora }}"