diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 321b473..dcf73b0 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -125,6 +125,9 @@
   apt:
     update-cache: yes
   when: (newhost is defined and newhost) or apt_config.changed or apt_key.changed
+  register: apt_res
+  retries: 5
+  until: apt_res is success
   tags: base-apt
 
 - name: aptitude safe upgrade with autoremove
@@ -133,6 +136,9 @@
     autoremove: yes
     upgrade: safe
   when: newhost is defined and newhost
+  register: apt_res
+  retries: 5
+  until: apt_res is success
   tags: base-apt
 
 - name: install dbus
@@ -141,6 +147,9 @@
       - dbus
     state: latest
   when: newhost is defined and newhost
+  register: apt_res
+  retries: 5
+  until: apt_res is success
   tags: base-apt
 
 - name: clean out apt cache
@@ -165,6 +174,9 @@
     state: absent
     purge: yes
     autoremove: yes
+  register: apt_res
+  retries: 5
+  until: apt_res is success
   tags: base-packages
 
 - name: set override debconf selections
@@ -178,6 +190,9 @@
     name:
       - python
   when: debian_version|int <= 10
+  register: apt_res
+  retries: 5
+  until: apt_res is success
   tags: base-packages
 
 - name: install common packages (bullseye+)
@@ -185,6 +200,9 @@
     name:
       - python-is-python3
   when: debian_version|int >= 11
+  register: apt_res
+  retries: 5
+  until: apt_res is success
   tags: base-packages
 
 - name: install common packages (all versions)
@@ -269,6 +287,9 @@
       - plymouth-themes
       - linux-image-amd64
       - linux-headers-amd64
+  register: apt_res
+  retries: 5
+  until: apt_res is success
   tags: base-packages
 
 - name: install cleanup scripts
diff --git a/roles/pvc/tasks/ceph/main.yml b/roles/pvc/tasks/ceph/main.yml
index 217d663..1ae8b4d 100644
--- a/roles/pvc/tasks/ceph/main.yml
+++ b/roles/pvc/tasks/ceph/main.yml
@@ -8,6 +8,9 @@
       - ceph-mgr
       - radosgw
     state: latest
+  register: apt_res
+  retries: 5
+  until: apt_res is success
 
 - name: add admin users to ceph groups
   user:
diff --git a/roles/pvc/tasks/frr/main.yml b/roles/pvc/tasks/frr/main.yml
index 016278a..d6da68e 100644
--- a/roles/pvc/tasks/frr/main.yml
+++ b/roles/pvc/tasks/frr/main.yml
@@ -4,6 +4,9 @@
     name:
       - frr
     state: latest
+  register: apt_res
+  retries: 5
+  until: apt_res is success
 
 - name: install frr configuration
   template:
diff --git a/roles/pvc/tasks/libvirt/main.yml b/roles/pvc/tasks/libvirt/main.yml
index 9c4f0f3..146fa46 100644
--- a/roles/pvc/tasks/libvirt/main.yml
+++ b/roles/pvc/tasks/libvirt/main.yml
@@ -10,6 +10,9 @@
       - ceph-common
       - libguestfs-tools
     state: latest
+  register: apt_res
+  retries: 5
+  until: apt_res is success
 
 - name: add libvirt user to ceph group
   user:
diff --git a/roles/pvc/tasks/patroni/main.yml b/roles/pvc/tasks/patroni/main.yml
index 1949465..95c5053 100644
--- a/roles/pvc/tasks/patroni/main.yml
+++ b/roles/pvc/tasks/patroni/main.yml
@@ -24,6 +24,9 @@
     name: "{{ package_list }}"
     state: latest
     update-cache: yes
+  register: apt_res
+  retries: 5
+  until: apt_res is success
 
 - name: stop and disable postgresql
   service:
diff --git a/roles/pvc/tasks/pvc/main.yml b/roles/pvc/tasks/pvc/main.yml
index c94416d..6a24897 100644
--- a/roles/pvc/tasks/pvc/main.yml
+++ b/roles/pvc/tasks/pvc/main.yml
@@ -13,6 +13,9 @@
       - rinse
     state: latest
   when: newhost is defined and newhost
+  register: apt_res
+  retries: 5
+  until: apt_res is success
 
 - name: install pvc node daemon configuration
   template:
diff --git a/roles/pvc/tasks/zookeeper/main.yml b/roles/pvc/tasks/zookeeper/main.yml
index 1872a5d..07f94b3 100644
--- a/roles/pvc/tasks/zookeeper/main.yml
+++ b/roles/pvc/tasks/zookeeper/main.yml
@@ -5,6 +5,9 @@
       - zookeeper
       - zookeeper-bin
     state: latest
+  register: apt_res
+  retries: 5
+  until: apt_res is success
 
 - name: install zookeeper configuration
   template: