diff --git a/nodes/ansible/os-get-info.playbook.yaml b/nodes/ansible/os-get-info.playbook.yaml
index 604897d..9efed0b 100644
--- a/nodes/ansible/os-get-info.playbook.yaml
+++ b/nodes/ansible/os-get-info.playbook.yaml
@@ -1,12 +1,7 @@
-- name: OS update playbook
+- name: OS Info playbook
   hosts: 
     - all
   become: true
   tasks:
-
-    - debug:
-        msg:
-        - "Distribution: {{ hostvars[inventory_hostname].ansible_distribution }}"
-        - "Major version: {{ hostvars[inventory_hostname].ansible_distribution_major_version }}"
-        - "Version: {{ hostvars[inventory_hostname].ansible_distribution_version }}"
-        - "kernel: {{ hostvars[inventory_hostname].ansible_kernel }}"
\ No newline at end of file
+    - ansible.builtin.import_tasks:
+        file: tasks/os-get-info.yaml
\ No newline at end of file
diff --git a/nodes/ansible/os-reboot.playbook.yaml b/nodes/ansible/os-reboot.playbook.yaml
new file mode 100644
index 0000000..557ef6b
--- /dev/null
+++ b/nodes/ansible/os-reboot.playbook.yaml
@@ -0,0 +1,8 @@
+- name: Reboot system playbook
+  hosts: 
+    - maintenance-node-target
+  become: true
+  tasks:
+    - ansible.builtin.import_tasks:
+        file: tasks/os-reboot.yaml
+    
diff --git a/nodes/ansible/os-update.playbook.yaml b/nodes/ansible/os-update.playbook.yaml
index 0f50b4c..116b563 100644
--- a/nodes/ansible/os-update.playbook.yaml
+++ b/nodes/ansible/os-update.playbook.yaml
@@ -1,44 +1,8 @@
 - name: OS update playbook
   hosts: 
-    - casa
-    - casa-minion-01
-    - casa-mini-minion-01
+    - maintenance-node-target
   become: true
   tasks:
-    - debug:
-        msg:
-        - "ansible_distribution {{ hostvars[inventory_hostname].ansible_distribution }}"
-        - "major version {{ hostvars[inventory_hostname].ansible_distribution_major_version }}"
-        - "version {{ hostvars[inventory_hostname].ansible_distribution_version }}"
-        - "version {{ hostvars[inventory_hostname].ansible_kernel }}"
+    - ansible.builtin.import_tasks:
+        file: tasks/os-update.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
-      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
-
-    - debug:
-        msg:
-        - "ansible_distribution {{ hostvars[inventory_hostname].ansible_distribution }}"
-        - "major version {{ hostvars[inventory_hostname].ansible_distribution_major_version }}"
-        - "version {{ hostvars[inventory_hostname].ansible_distribution_version }}"
-        - "version {{ hostvars[inventory_hostname].ansible_kernel }}"
\ No newline at end of file
diff --git a/nodes/ansible/tasks/os-get-info.yaml b/nodes/ansible/tasks/os-get-info.yaml
new file mode 100644
index 0000000..105ec46
--- /dev/null
+++ b/nodes/ansible/tasks/os-get-info.yaml
@@ -0,0 +1,6 @@
+- debug:
+    msg:
+    - "Distribution: {{ hostvars[inventory_hostname].ansible_distribution }}"
+    - "Major version: {{ hostvars[inventory_hostname].ansible_distribution_major_version }}"
+    - "Version: {{ hostvars[inventory_hostname].ansible_distribution_version }}"
+    - "kernel: {{ hostvars[inventory_hostname].ansible_kernel }}"
\ No newline at end of file
diff --git a/nodes/ansible/tasks/os-reboot.yaml b/nodes/ansible/tasks/os-reboot.yaml
new file mode 100644
index 0000000..3ea793c
--- /dev/null
+++ b/nodes/ansible/tasks/os-reboot.yaml
@@ -0,0 +1,7 @@
+- 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
\ No newline at end of file
diff --git a/nodes/ansible/tasks/os-update.yaml b/nodes/ansible/tasks/os-update.yaml
new file mode 100644
index 0000000..0b88b30
--- /dev/null
+++ b/nodes/ansible/tasks/os-update.yaml
@@ -0,0 +1,23 @@
+- ansible.builtin.import_tasks:
+    file: os-get-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
+  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
+
+- ansible.builtin.import_tasks:
+    file: os-reboot.yaml
+  when: reboot_required_file.stat.exists
+
+- ansible.builtin.import_tasks:
+      file: os-get-info.yaml
\ No newline at end of file