diff --git a/tasks/main.yml b/tasks/main.yml
index 69c38c9..98d63bb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,12 +9,12 @@
   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/'
@@ -22,12 +22,12 @@
 - name: 'package discovery'
   when:
     - ansible_system == 'Linux'
-    - packages is not defined
+    - ansible_facts["packages"] is not defined
   ansible.builtin.package_facts:
 - name: 'service discovery'
   when:
     - ansible_system == 'Linux'
-    - services is not defined
+    - ansible_facts["services"] is not defined
   ansible.builtin.service_facts:
 - name: 'ensure packages'
   when:
diff --git a/vars/Fedora-34-default.yml b/vars/AlmaLinux-10-default.yml
similarity index 94%
rename from vars/Fedora-34-default.yml
rename to vars/AlmaLinux-10-default.yml
index c774fed..3eb8a23 100644
--- a/vars/Fedora-34-default.yml
+++ b/vars/AlmaLinux-10-default.yml
@@ -3,3 +3,5 @@
 package_list:
   - name: 'git'
     state: 'present'
+...
+
diff --git a/vars/Fedora-35-default.yml b/vars/AlmaLinux-8-default.yml
similarity index 94%
rename from vars/Fedora-35-default.yml
rename to vars/AlmaLinux-8-default.yml
index c774fed..3eb8a23 100644
--- a/vars/Fedora-35-default.yml
+++ b/vars/AlmaLinux-8-default.yml
@@ -3,3 +3,5 @@
 package_list:
   - name: 'git'
     state: 'present'
+...
+
diff --git a/vars/Fedora-36-default.yml b/vars/AlmaLinux-9-default.yml
similarity index 94%
rename from vars/Fedora-36-default.yml
rename to vars/AlmaLinux-9-default.yml
index c774fed..3eb8a23 100644
--- a/vars/Fedora-36-default.yml
+++ b/vars/AlmaLinux-9-default.yml
@@ -3,3 +3,5 @@
 package_list:
   - name: 'git'
     state: 'present'
+...
+
diff --git a/vars/Fedora-37-default.yml b/vars/CentOS-10-default.yml
similarity index 94%
rename from vars/Fedora-37-default.yml
rename to vars/CentOS-10-default.yml
index c774fed..3eb8a23 100644
--- a/vars/Fedora-37-default.yml
+++ b/vars/CentOS-10-default.yml
@@ -3,3 +3,5 @@
 package_list:
   - name: 'git'
     state: 'present'
+...
+
diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/CentOS-8-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/CentOS-9-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Debian-11-default.yml b/vars/Debian-11-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/Debian-11-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Debian-12-default.yml b/vars/Debian-12-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/Debian-12-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Debian-13-default.yml b/vars/Debian-13-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/Debian-13-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml
deleted file mode 100644
index c774fed..0000000
--- a/vars/Fedora-38-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# vars file for ensure_git
-package_list:
-  - name: 'git'
-    state: 'present'
diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml
deleted file mode 100644
index c774fed..0000000
--- a/vars/Fedora-39-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# vars file for ensure_git
-package_list:
-  - name: 'git'
-    state: 'present'
diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml
deleted file mode 100644
index c774fed..0000000
--- a/vars/Fedora-40-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# vars file for ensure_git
-package_list:
-  - name: 'git'
-    state: 'present'
diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml
deleted file mode 100644
index c774fed..0000000
--- a/vars/Fedora-41-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# vars file for ensure_git
-package_list:
-  - name: 'git'
-    state: 'present'
diff --git a/vars/Fedora-42-default.yml b/vars/Fedora-42-default.yml
index c774fed..3eb8a23 100644
--- a/vars/Fedora-42-default.yml
+++ b/vars/Fedora-42-default.yml
@@ -3,3 +3,5 @@
 package_list:
   - name: 'git'
     state: 'present'
+...
+
diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml
index c774fed..3eb8a23 100644
--- a/vars/Fedora-43-default.yml
+++ b/vars/Fedora-43-default.yml
@@ -3,3 +3,5 @@
 package_list:
   - name: 'git'
     state: 'present'
+...
+
diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml
index c774fed..3eb8a23 100644
--- a/vars/Fedora-44-default.yml
+++ b/vars/Fedora-44-default.yml
@@ -3,3 +3,5 @@
 package_list:
   - name: 'git'
     state: 'present'
+...
+
diff --git a/vars/OracleLinux-10-default.yml b/vars/OracleLinux-10-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/OracleLinux-10-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/OracleLinux-8-default.yml b/vars/OracleLinux-8-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/OracleLinux-8-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/OracleLinux-9-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/Rocky-10-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Rocky-8-default.yml b/vars/Rocky-8-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/Rocky-8-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/Rocky-9-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Ubuntu-22-default.yml b/vars/Ubuntu-22-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/Ubuntu-22-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Ubuntu-24-default.yml b/vars/Ubuntu-24-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/Ubuntu-24-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+
diff --git a/vars/Ubuntu-26-default.yml b/vars/Ubuntu-26-default.yml
new file mode 100644
index 0000000..3eb8a23
--- /dev/null
+++ b/vars/Ubuntu-26-default.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_git
+package_list:
+  - name: 'git'
+    state: 'present'
+...
+