diff --git a/playbooks/host_maintenance/os_update.yaml b/playbooks/host_maintenance/os_update.yaml
index 64fbbf3..64e6106 100644
--- a/playbooks/host_maintenance/os_update.yaml
+++ b/playbooks/host_maintenance/os_update.yaml
@@ -4,4 +4,4 @@
   tasks:
     - ansible.builtin.include_role:
         name: mylimbo.globals.host_maintenance
-        tasks_from: os_update
\ No newline at end of file
+        tasks_from: os_dist_uprade
\ No newline at end of file
diff --git a/roles/host_maintenance/tasks/os_dist_upgrade.yaml b/roles/host_maintenance/tasks/os_dist_upgrade.yaml
new file mode 100644
index 0000000..352dae1
--- /dev/null
+++ b/roles/host_maintenance/tasks/os_dist_upgrade.yaml
@@ -0,0 +1,29 @@
+- ansible.builtin.import_tasks:
+    file: os_info.yaml
+
+- name: Update all Packages to their latest version
+  ansible.builtin.apt:
+    update_cache: true
+    force_apt_get: true
+
+- name: Upgrade all packages on servers (dist upgrade)
+  ansible.builtin.apt:
+    upgrade: dist 
+    force_apt_get: true
+
+- name: Check if a reboot is needed
+  register: reboot_required_file
+  stat: path=/var/run/reboot-required
+
+- name: Reboot server
+  reboot:
+    msg: "Reboot initiated by Ansible due to kernel updates"
+    connect_timeout: 5
+    reboot_timeout: 300
+    pre_reboot_delay: 0
+    post_reboot_delay: 30
+    test_command: uptime
+  when: reboot_required_file.stat.exists
+
+- ansible.builtin.import_tasks:
+    file: os_info.yaml
diff --git a/roles/host_maintenance/tasks/os_upgrade.yaml b/roles/host_maintenance/tasks/os_upgrade.yaml
new file mode 100644
index 0000000..e27abc3
--- /dev/null
+++ b/roles/host_maintenance/tasks/os_upgrade.yaml
@@ -0,0 +1,29 @@
+- ansible.builtin.import_tasks:
+    file: os_info.yaml
+
+- name: Update all Packages to their latest version
+  ansible.builtin.apt:
+    update_cache: true
+    force_apt_get: true
+
+- name: Upgrade packages on servers (upgrade)
+  ansible.builtin.apt:
+    upgrade: yes 
+    force_apt_get: true
+
+- name: Check if a reboot is needed
+  register: reboot_required_file
+  stat: path=/var/run/reboot-required
+
+- name: Reboot server
+  reboot:
+    msg: "Reboot initiated by Ansible due to kernel updates"
+    connect_timeout: 5
+    reboot_timeout: 300
+    pre_reboot_delay: 0
+    post_reboot_delay: 30
+    test_command: uptime
+  when: reboot_required_file.stat.exists
+
+- ansible.builtin.import_tasks:
+    file: os_info.yaml