diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 2d7d36a0..aef48d60 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -64,5 +64,6 @@
 - name: Refresh apt cache
   apt:
     update_cache: yes
-  changed_when: false
-  ignore_errors: yes
+  register: apt_update
+  retries: 100
+  until: apt_update is success or ('Failed to lock apt for exclusive operation' not in apt_update.msg and '/var/lib/dpkg/lock' not in apt_update.msg)
\ No newline at end of file
diff --git a/roles/user/tasks/main.yml b/roles/user/tasks/main.yml
index 02372bb8..dc6e9182 100644
--- a/roles/user/tasks/main.yml
+++ b/roles/user/tasks/main.yml
@@ -92,7 +92,6 @@
     # sources our profile. We won't create the file if it doesn't exist and
     # we can ignore any errors
     create: no
-  ignore_errors: yes
   loop: "{{ real_users }}"
 - name: Remove Timeshift warning
   dconf: