diff --git a/handlers/main.yml b/handlers/main.yml
index 4f76005..c19bb4c 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -6,14 +6,14 @@
   ansible.builtin.service_facts:
 - name: 'ensure_repo_epel.service_reload'
   when:
-    - ansible_system == 'Linux'
-    - ansible_service_mgr == 'systemd'
+    - ansible_facts["system"] == 'Linux'
+    - ansible_facts["service_mgr"] == 'systemd'
     - ensure_repo_epel is defined
   ansible.builtin.systemd:
     daemon_reload: 'yes'
 - name: 'ensure_repo_epel.service_restart'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
     - ensure_repo_epel is defined
     - ensure_repo_epel.service_list is defined
     - ensure_repo_epel.service_list is iterable
diff --git a/tasks/main.yml b/tasks/main.yml
index f520bb0..36e8fbd 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -12,9 +12,9 @@
         - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
         - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
         - '{{ ansible_facts["distribution"] }}-default.yml'
-        - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
-        - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
-        - '{{ ansible_os_family }}-default.yml'
+        - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
+        - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
+        - '{{ ansible_facts["os_family"] }}-default.yml'
         - 'default.yml'
       paths:
         - '../vars/'
@@ -27,7 +27,7 @@
 - name: 'service discovery'
   when:
     - ansible_facts["system"] == 'Linux'
-    - services is not defined
+    - ansible_facts["services"] is not defined
   ansible.builtin.service_facts:
 - name: 'ensure packages'
   when: