diff --git a/tasks/main.yml b/tasks/main.yml
index 08852da..f0cfcf8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -60,7 +60,7 @@
   notify:
     - 'ensure_os_patch.package_facts'
     - 'ensure_os_patch.service_facts'
-- name: 'ensure Debian patch'
+- name: 'ensure apt patch'
   when:
     - ansible_system == 'Linux'
     - ansible_pkg_mgr == 'apt'
@@ -71,6 +71,16 @@
   notify:
     - 'ensure_os_patch.package_facts'
     - 'ensure_os_patch.service_facts'
+- name: 'ensure dnf or yum patch'
+  when:
+    - ansible_system == 'Linux'
+    - ansible_pkg_mgr == 'dnf' or ansible_pkg_mgr == 'dnf5' or ansible_pkg_mgr == 'yum'
+  ansible.builtin.package:
+    name: '*'
+    state: 'latest'
+  notify:
+    - 'ensure_os_patch.package_facts'
+    - 'ensure_os_patch.service_facts'
 - name: 'ensure services'
   when:
     - ansible_system == 'Linux'
diff --git a/vars/AlmaLinux-10-default.yml b/vars/AlmaLinux-10-default.yml
new file mode 100644
index 0000000..a85d5d6
--- /dev/null
+++ b/vars/AlmaLinux-10-default.yml
@@ -0,0 +1,14 @@
+---
+# vars file for ensure_os_patch
+package_list:
+  - name: 'dnf-automatic'
+    state: 'present'
+service_list:
+  - name: 'dnf-automatic.timer'
+    state: 'started'
+    enabled: 'yes'
+  - name: 'dnf-automatic-install.timer'
+    state: 'started'
+    enabled: 'yes'
+...
+
diff --git a/vars/AlmaLinux-8-default.yml b/vars/AlmaLinux-8-default.yml
index ebd4420..a85d5d6 100644
--- a/vars/AlmaLinux-8-default.yml
+++ b/vars/AlmaLinux-8-default.yml
@@ -3,8 +3,6 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
@@ -12,3 +10,5 @@ service_list:
   - name: 'dnf-automatic-install.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/AlmaLinux-9-default.yml b/vars/AlmaLinux-9-default.yml
index ebd4420..a85d5d6 100644
--- a/vars/AlmaLinux-9-default.yml
+++ b/vars/AlmaLinux-9-default.yml
@@ -3,8 +3,6 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
@@ -12,3 +10,5 @@ service_list:
   - name: 'dnf-automatic-install.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/CentOS-10-default.yml b/vars/CentOS-10-default.yml
new file mode 100644
index 0000000..a85d5d6
--- /dev/null
+++ b/vars/CentOS-10-default.yml
@@ -0,0 +1,14 @@
+---
+# vars file for ensure_os_patch
+package_list:
+  - name: 'dnf-automatic'
+    state: 'present'
+service_list:
+  - name: 'dnf-automatic.timer'
+    state: 'started'
+    enabled: 'yes'
+  - name: 'dnf-automatic-install.timer'
+    state: 'started'
+    enabled: 'yes'
+...
+
diff --git a/vars/CentOS-6-default.yml b/vars/CentOS-6-default.yml
deleted file mode 100644
index 5578b25..0000000
--- a/vars/CentOS-6-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# vars file for ensure_os_patch
-package_list:
-  - name: '*'
-    state: 'latest'
diff --git a/vars/CentOS-7-default.yml b/vars/CentOS-7-default.yml
deleted file mode 100644
index 5578b25..0000000
--- a/vars/CentOS-7-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# vars file for ensure_os_patch
-package_list:
-  - name: '*'
-    state: 'latest'
diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml
index ebd4420..a85d5d6 100644
--- a/vars/CentOS-8-default.yml
+++ b/vars/CentOS-8-default.yml
@@ -3,8 +3,6 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
@@ -12,3 +10,5 @@ service_list:
   - name: 'dnf-automatic-install.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml
index ebd4420..a85d5d6 100644
--- a/vars/CentOS-9-default.yml
+++ b/vars/CentOS-9-default.yml
@@ -3,8 +3,6 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
@@ -12,3 +10,5 @@ service_list:
   - name: 'dnf-automatic-install.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-21-default.yml b/vars/Fedora-21-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-21-default.yml
+++ b/vars/Fedora-21-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-22-default.yml b/vars/Fedora-22-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-22-default.yml
+++ b/vars/Fedora-22-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-23-default.yml b/vars/Fedora-23-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-23-default.yml
+++ b/vars/Fedora-23-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-24-default.yml b/vars/Fedora-24-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-24-default.yml
+++ b/vars/Fedora-24-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-25-default.yml b/vars/Fedora-25-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-25-default.yml
+++ b/vars/Fedora-25-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-26-default.yml b/vars/Fedora-26-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-26-default.yml
+++ b/vars/Fedora-26-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-27-default.yml b/vars/Fedora-27-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-27-default.yml
+++ b/vars/Fedora-27-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-28-default.yml b/vars/Fedora-28-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-28-default.yml
+++ b/vars/Fedora-28-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-29-default.yml b/vars/Fedora-29-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-29-default.yml
+++ b/vars/Fedora-29-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-30-default.yml b/vars/Fedora-30-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-30-default.yml
+++ b/vars/Fedora-30-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-31-default.yml
+++ b/vars/Fedora-31-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-32-default.yml
+++ b/vars/Fedora-32-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-33-default.yml
+++ b/vars/Fedora-33-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml
index 3483ce3..2945494 100644
--- a/vars/Fedora-34-default.yml
+++ b/vars/Fedora-34-default.yml
@@ -3,9 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
+
diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml
index ebd4420..2945494 100644
--- a/vars/Fedora-35-default.yml
+++ b/vars/Fedora-35-default.yml
@@ -3,12 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
-  - name: 'dnf-automatic-install.timer'
-    state: 'started'
-    enabled: 'yes'
+...
+
diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml
index ebd4420..2945494 100644
--- a/vars/Fedora-36-default.yml
+++ b/vars/Fedora-36-default.yml
@@ -3,12 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
-  - name: 'dnf-automatic-install.timer'
-    state: 'started'
-    enabled: 'yes'
+...
+
diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml
index ebd4420..2945494 100644
--- a/vars/Fedora-37-default.yml
+++ b/vars/Fedora-37-default.yml
@@ -3,12 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
-  - name: 'dnf-automatic-install.timer'
-    state: 'started'
-    enabled: 'yes'
+...
+
diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml
index ebd4420..2945494 100644
--- a/vars/Fedora-38-default.yml
+++ b/vars/Fedora-38-default.yml
@@ -3,12 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
-  - name: 'dnf-automatic-install.timer'
-    state: 'started'
-    enabled: 'yes'
+...
+
diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml
index ebd4420..2945494 100644
--- a/vars/Fedora-39-default.yml
+++ b/vars/Fedora-39-default.yml
@@ -3,12 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
-  - name: 'dnf-automatic-install.timer'
-    state: 'started'
-    enabled: 'yes'
+...
+
diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml
index ebd4420..2945494 100644
--- a/vars/Fedora-40-default.yml
+++ b/vars/Fedora-40-default.yml
@@ -3,12 +3,9 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
     enabled: 'yes'
-  - name: 'dnf-automatic-install.timer'
-    state: 'started'
-    enabled: 'yes'
+...
+
diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml
index 9a51583..ddda6ef 100644
--- a/vars/Fedora-41-default.yml
+++ b/vars/Fedora-41-default.yml
@@ -3,9 +3,8 @@
 package_list:
   - name: 'dnf5-plugin-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf5-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
diff --git a/vars/Fedora-42-default.yml b/vars/Fedora-42-default.yml
index 9a51583..ddda6ef 100644
--- a/vars/Fedora-42-default.yml
+++ b/vars/Fedora-42-default.yml
@@ -3,9 +3,8 @@
 package_list:
   - name: 'dnf5-plugin-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf5-automatic.timer'
     state: 'started'
     enabled: 'yes'
+...
diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml
new file mode 100644
index 0000000..ddda6ef
--- /dev/null
+++ b/vars/Fedora-43-default.yml
@@ -0,0 +1,10 @@
+---
+# vars file for ensure_os_patch
+package_list:
+  - name: 'dnf5-plugin-automatic'
+    state: 'present'
+service_list:
+  - name: 'dnf5-automatic.timer'
+    state: 'started'
+    enabled: 'yes'
+...
diff --git a/vars/OracleLinux-10-default.yml b/vars/OracleLinux-10-default.yml
new file mode 100644
index 0000000..9c4bbbd
--- /dev/null
+++ b/vars/OracleLinux-10-default.yml
@@ -0,0 +1,13 @@
+---
+# vars file for ensure_os_patch
+package_list:
+  - name: 'dnf-automatic'
+    state: 'present'
+service_list:
+  - name: 'dnf-automatic.timer'
+    state: 'started'
+    enabled: 'yes'
+  - name: 'dnf-automatic-install.timer'
+    state: 'started'
+    enabled: 'yes'
+...
diff --git a/vars/OracleLinux-8-default.yml b/vars/OracleLinux-8-default.yml
index ebd4420..9c4bbbd 100644
--- a/vars/OracleLinux-8-default.yml
+++ b/vars/OracleLinux-8-default.yml
@@ -3,8 +3,6 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
@@ -12,3 +10,4 @@ service_list:
   - name: 'dnf-automatic-install.timer'
     state: 'started'
     enabled: 'yes'
+...
diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml
index ebd4420..9c4bbbd 100644
--- a/vars/OracleLinux-9-default.yml
+++ b/vars/OracleLinux-9-default.yml
@@ -3,8 +3,6 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
@@ -12,3 +10,4 @@ service_list:
   - name: 'dnf-automatic-install.timer'
     state: 'started'
     enabled: 'yes'
+...
diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml
new file mode 100644
index 0000000..9c4bbbd
--- /dev/null
+++ b/vars/Rocky-10-default.yml
@@ -0,0 +1,13 @@
+---
+# vars file for ensure_os_patch
+package_list:
+  - name: 'dnf-automatic'
+    state: 'present'
+service_list:
+  - name: 'dnf-automatic.timer'
+    state: 'started'
+    enabled: 'yes'
+  - name: 'dnf-automatic-install.timer'
+    state: 'started'
+    enabled: 'yes'
+...
diff --git a/vars/Rocky-8-default.yml b/vars/Rocky-8-default.yml
index ebd4420..9c4bbbd 100644
--- a/vars/Rocky-8-default.yml
+++ b/vars/Rocky-8-default.yml
@@ -3,8 +3,6 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
@@ -12,3 +10,4 @@ service_list:
   - name: 'dnf-automatic-install.timer'
     state: 'started'
     enabled: 'yes'
+...
diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml
index ebd4420..9c4bbbd 100644
--- a/vars/Rocky-9-default.yml
+++ b/vars/Rocky-9-default.yml
@@ -3,8 +3,6 @@
 package_list:
   - name: 'dnf-automatic'
     state: 'present'
-  - name: '*'
-    state: 'latest'
 service_list:
   - name: 'dnf-automatic.timer'
     state: 'started'
@@ -12,3 +10,4 @@ service_list:
   - name: 'dnf-automatic-install.timer'
     state: 'started'
     enabled: 'yes'
+...