diff --git a/playbooks/update.yaml b/playbooks/update.yaml
index 5879cf0..1b37a37 100644
--- a/playbooks/update.yaml
+++ b/playbooks/update.yaml
@@ -1,5 +1,5 @@
 ---
-- name: APT update/upgrade zonder reboot met eindrapport
+- name: APT update/upgrade zonder reboot
   hosts: all
   gather_facts: true
 
@@ -15,6 +15,8 @@
         upgrade: dist
         autoremove: true
         autoclean: true
+        dpkg_options: "force-confdef,force-confold"
+        lock_timeout: 300
       register: apt_upgrade_result
 
     - name: Check if reboot is required
@@ -22,11 +24,16 @@
         path: /var/run/reboot-required
       register: reboot_required
 
+    - name: Check reboot-required package list
+      ansible.builtin.stat:
+        path: /var/run/reboot-required.pkgs
+      register: reboot_required_pkgs_file
+
     - name: Read reboot-required package list
       ansible.builtin.slurp:
         src: /var/run/reboot-required.pkgs
       register: reboot_required_pkgs
-      when: reboot_required.stat.exists
+      when: reboot_required_pkgs_file.stat.exists
 
     - name: Save per-host report data
       ansible.builtin.set_fact:
@@ -36,15 +43,14 @@
           reboot_required: "{{ reboot_required.stat.exists }}"
           reboot_required_packages: >-
             {{
-              (
-                reboot_required_pkgs.content | b64decode
-              ).splitlines()
-              if reboot_required.stat.exists and reboot_required_pkgs is defined and reboot_required_pkgs.content is defined
+              (reboot_required_pkgs.content | b64decode).splitlines()
+              if reboot_required_pkgs_file.stat.exists
               else []
             }}
 
 - name: Toon eindrapport
   hosts: localhost
+  connection: local
   gather_facts: false
 
   tasks: