diff --git a/Maintenance/maint-reboot.yaml b/Maintenance/maint-reboot.yaml
index df1434e..c395e73 100644
--- a/Maintenance/maint-reboot.yaml
+++ b/Maintenance/maint-reboot.yaml
@@ -2,10 +2,14 @@
 - name: Reboot machine
   hosts: "{{ Daily_Reboot_Hosts }}"
   become: yes
+  become_method: sudo
 
   tasks:
     - name: Reboot machine
-      become: yes
-      ansible.builtin.reboot:
-        reboot_timeout: 3600
-        msg: "Automatic reboot initiated"
\ No newline at end of file
+      command: /sbin/reboot
+      async: 1
+      poll: 0
+      when: reboot.stat.exists == true
+
+    - name: Wait for systems to become reachable
+      wait_for_connection:
\ No newline at end of file
diff --git a/Update/upd-apt.yaml b/Update/upd-apt.yaml
index 0095494..530bdc5 100644
--- a/Update/upd-apt.yaml
+++ b/Update/upd-apt.yaml
@@ -1,32 +1,27 @@
 ---
 - name: Update and upgrade apt packages
   hosts: all
-  become: true
+  become: yes
+  become_method: sudo
 
   tasks:
     - name: Update packages with apt
       when: ansible_pkg_mgr == 'apt'
-      become: true
       apt:
         update_cache: true
 
     - name: Upgrade packages with apt
       when: ansible_pkg_mgr == 'apt'
-      become: true
       command: sudo apt-get upgrade -y
     
     - name: Update packages with yum
       when: ansible_pkg_mgr == 'yum'
-      become: true
-      become_method: sudo
       ansible.builtin.yum:
         name: '*'
         state: latest # noqa: package-latest
 
     - name: Upgrade packages with yum
       when: ansible_pkg_mgr == 'yum'
-      become: true
-      become_method: sudo
       ansible.builtin.yum:
         name: '*'
         state: latest # noqa: package-latest