diff --git a/playbooks/zuul_reboot.yaml b/playbooks/zuul_reboot.yaml
index fa5b334469..db14461c5c 100644
--- a/playbooks/zuul_reboot.yaml
+++ b/playbooks/zuul_reboot.yaml
@@ -18,6 +18,11 @@
       apt:
         update_cache: yes
         upgrade: yes
+        register: apt_action
+        # 20 minute wait for unattended-upgrades to complete
+        delay: 30
+        retries: 40
+        until: apt_action is success or 'Failed to lock apt for exclusive operation' not in apt_action.msg
     - name: Reboot the executor server
       reboot:
     - name: Start the executor
@@ -37,6 +42,11 @@
       apt:
         update_cache: yes
         upgrade: yes
+        register: apt_action
+        # 20 minute wait for unattended-upgrades to complete
+        delay: 30
+        retries: 40
+        until: apt_action is success or 'Failed to lock apt for exclusive operation' not in apt_action.msg
     - name: Reboot the merger server
       reboot:
     - name: Start the merger
@@ -62,6 +72,11 @@
       apt:
         update_cache: yes
         upgrade: yes
+        register: apt_action
+        # 20 minute wait for unattended-upgrades to complete
+        delay: 30
+        retries: 40
+        until: apt_action is success or 'Failed to lock apt for exclusive operation' not in apt_action.msg
     - name: Reboot the scheduler server
       reboot:
     - name: Start the scheduler process