diff --git a/playbooks/update_system.yml b/playbooks/update_system.yml
index 718fc4d..17949e2 100644
--- a/playbooks/update_system.yml
+++ b/playbooks/update_system.yml
@@ -1,23 +1,30 @@
 - name: Update and Upgrade Packages
   hosts: all
-  become: yes
+  become: true
+  gather_facts: true
+
   tasks:
-
-    - name: Get OS Family
-      ansible.builtin.setup:
-        gather_subset:
-          - "min"
-      register: system_info
-
     - name: Update & Upgrade - Debian-based systems
       ansible.builtin.apt:
-        update_cache: yes
-        upgrade: yes
-      when: system_info.ansible_facts.ansible_os_family == "Debian"
+        update_cache: true
+        cache_valid_time: 3600
+        upgrade: dist
+      when: ansible_os_family == "Debian"
 
-    - name: Update & Upgrade - RHEL-based systems
+    - name: Update & Upgrade - Modern RHEL-based systems (DNF)
+      ansible.builtin.dnf:
+        name: "*"
+        state: latest
+        update_cache: true
+      when: 
+        - ansible_os_family == "RedHat"
+        - ansible_pkg_mgr == "dnf"
+
+    - name: Update & Upgrade - Legacy RHEL-based systems (YUM)
       ansible.builtin.yum:
         name: "*"
         state: latest
-      when: system_info.ansible_facts.ansible_os_family == "RedHat"
-
+        update_cache: true
+      when: 
+        - ansible_os_family == "RedHat"
+        - ansible_pkg_mgr == "yum"
\ No newline at end of file