diff --git a/infrastructure-playbooks/add-mon.yml b/infrastructure-playbooks/add-mon.yml
index ae561862c..55cfa3a64 100644
--- a/infrastructure-playbooks/add-mon.yml
+++ b/infrastructure-playbooks/add-mon.yml
@@ -29,6 +29,19 @@
         name: ceph-facts
     - import_role:
         name: ceph-validate
+    - import_role:
+        name: ceph-infra
+    - import_role:
+        name: ceph-handler
+    - import_role:
+        name: ceph-common
+      when: not containerized_deployment | bool
+    - import_role:
+        name: ceph-container-engine
+      when: containerized_deployment | bool
+    - import_role:
+        name: ceph-container-common
+      when: containerized_deployment | bool
 
 - hosts: mons
   gather_facts: false
@@ -40,16 +53,8 @@
         name: ceph-facts
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-common
-      when: not containerized_deployment | bool
-    - import_role:
-        name: ceph-container-common
-      when: containerized_deployment | bool
     - import_role:
         name: ceph-config
-    - import_role:
-        name: ceph-infra
     - import_role:
         name: ceph-mon
 
diff --git a/infrastructure-playbooks/add-osd.yml b/infrastructure-playbooks/add-osd.yml
index bd1ae3354..838785924 100644
--- a/infrastructure-playbooks/add-osd.yml
+++ b/infrastructure-playbooks/add-osd.yml
@@ -73,6 +73,22 @@
       run_once: True
       when: delegate_facts_host | bool
 
+    - import_role:
+        name: ceph-facts
+    - import_role:
+        name: ceph-handler
+    - import_role:
+        name: ceph-infra
+    - import_role:
+        name: ceph-container-engine
+      when: containerized_deployment | bool
+    - import_role:
+        name: ceph-container-common
+      when: containerized_deployment | bool
+    - import_role:
+        name: ceph-common
+      when: not containerized_deployment | bool
+
     # this task is needed so we can skip the openstack_config.yml include in roles/ceph-osd
     - name: set_fact add_osd
       set_fact:
@@ -90,24 +106,10 @@
 
     - import_role:
         name: ceph-facts
-
     - import_role:
         name: ceph-handler
-
-    - import_role:
-        name: ceph-infra
-
-    - import_role:
-        name: ceph-container-common
-      when: containerized_deployment | bool
-
-    - import_role:
-        name: ceph-common
-      when: not containerized_deployment | bool
-
     - import_role:
         name: ceph-config
-
     - import_role:
         name: ceph-osd