diff --git a/handlers/main.yml b/handlers/main.yml
index f1abfb0..3336b42 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -6,14 +6,14 @@
   ansible.builtin.service_facts:
 - name: 'ensure_podman.service_reload'
   when:
-    - ansible_system == 'Linux'
-    - ansible_service_mgr == 'systemd'
+    - ansible_facts["system"] == 'Linux'
+    - ansible_facts["service_mgr"] == 'systemd'
     - ensure_podman is defined
   ansible.builtin.systemd:
     daemon_reload: 'yes'
 - name: 'ensure_podman.service_restart'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
     - ensure_podman is defined
     - ensure_podman.service_list is defined
     - ensure_podman.service_list is iterable
diff --git a/tasks/main.yml b/tasks/main.yml
index a4ce68a..afd8726 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,36 +2,36 @@
 # tasks file for ensure_podman
 - name: 'include variables'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
   include_vars:
     file: '{{ lookup("first_found", findme ) }}'
     name: 'ensure_podman'
   vars:
     findme:
       files:
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml'
-        - '{{ ansible_distribution }}-default.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml'
-        - '{{ ansible_os_family }}-default.yml'
+        - '{{ 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_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/'
       errors: 'ignore'
 - name: 'package discovery'
   when:
-    - ansible_system == 'Linux'
-    - packages is not defined
+    - ansible_facts["system"] == 'Linux'
+    - ansible_facts["packages"] is not defined
   ansible.builtin.package_facts:
 - name: 'service discovery'
   when:
-    - ansible_system == 'Linux'
-    - services is not defined
+    - ansible_facts["system"] == 'Linux'
+    - ansible_facts["services"] is not defined
   ansible.builtin.service_facts:
 - name: 'ensure packages'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
     - ensure_podman is defined
     - ensure_podman.package_list is defined
     - ensure_podman.package_list is iterable
@@ -46,7 +46,7 @@
     - 'ensure_podman.service_facts'
 - name: 'ensure services'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
     - ensure_podman is defined
     - ensure_podman.service_list is defined
     - ensure_podman.service_list is iterable
@@ -62,10 +62,10 @@
     - 'ensure_podman.service_facts'
 - name: 'Ensure cgroup v2 have not been disabled'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
     - ensure_podman is defined
-    - ansible_distribution == 'Fedora'
-    - ansible_distribution_major_version is version('32', '>=')
+    - ansible_facts["distribution"] == 'Fedora'
+    - ansible_facts["distribution_major_version"] is version('32', '>=')
     - ansible_cmdline is defined
     - ansible_cmdline['systemd.unified_cgroup_hierarchy'] is defined
   shell:
@@ -73,10 +73,10 @@
       grubby --update-kernel=ALL --remove-args=systemd.unified_cgroup_hierarchy=0
 - name: 'Reboot to disable cgroups v1'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
     - ensure_podman is defined
-    - ansible_distribution == 'Fedora'
-    - ansible_distribution_major_version is version('32', '>=')
+    - ansible_facts["distribution"] == 'Fedora'
+    - ansible_facts["distribution_major_version"] is version('32', '>=')
     - ansible_cmdline is defined
     - ansible_cmdline['systemd.unified_cgroup_hierarchy'] is defined
   reboot:
diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml
deleted file mode 100644
index e911115..0000000
--- a/vars/Fedora-31-default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml
deleted file mode 100644
index e911115..0000000
--- a/vars/Fedora-32-default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml
deleted file mode 100644
index e911115..0000000
--- a/vars/Fedora-33-default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml
deleted file mode 100644
index e911115..0000000
--- a/vars/Fedora-34-default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml
deleted file mode 100644
index e911115..0000000
--- a/vars/Fedora-35-default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml
deleted file mode 100644
index e911115..0000000
--- a/vars/Fedora-36-default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml
deleted file mode 100644
index e5f0112..0000000
--- a/vars/Fedora-37-default.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-  - name: 'podman-compose'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml
deleted file mode 100644
index e5f0112..0000000
--- a/vars/Fedora-38-default.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-  - name: 'podman-compose'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml
deleted file mode 100644
index e5f0112..0000000
--- a/vars/Fedora-39-default.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-  - name: 'podman-compose'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml
deleted file mode 100644
index e5f0112..0000000
--- a/vars/Fedora-40-default.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-  - name: 'podman-compose'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'
diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml
deleted file mode 100644
index e5f0112..0000000
--- a/vars/Fedora-41-default.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# vars file for ensure_podman
-package_list:
-  - name: 'cockpit-podman'
-    state: 'present'
-  - name: 'podman'
-    state: 'present'
-  - name: 'podman-compose'
-    state: 'present'
-service_list:
-  - name: 'podman.socket'
-    state: 'started'
-    enabled: 'yes'