diff --git a/roles/cloudlab-prep/tasks/main.yml b/roles/cloudlab-prep/tasks/main.yml
index 5bf71a3..f66e94d 100644
--- a/roles/cloudlab-prep/tasks/main.yml
+++ b/roles/cloudlab-prep/tasks/main.yml
@@ -13,4 +13,8 @@
   command: /usr/testbed/bin/mkextrafs -r {{ item.dev }} -qf {{ item.mount }}
     creates={{ item.mount }}/lost+found
   with_items: "{{ cloudlab_extrafs }}"
+  register: result
+  until: result | success
+  retries: 3
+  delay: 5
 
diff --git a/roles/simulate-fabric/files/simulate-fabric-playbook.yml b/roles/simulate-fabric/files/simulate-fabric-playbook.yml
index 55b6587..da1e876 100644
--- a/roles/simulate-fabric/files/simulate-fabric-playbook.yml
+++ b/roles/simulate-fabric/files/simulate-fabric-playbook.yml
@@ -13,6 +13,10 @@
         update_cache=yes
         cache_valid_time=3600
       become: yes
+      register: result
+      until: result | success
+      retries: 15
+      delay: 60
       with_items:
        - bridge-utils