diff --git a/infrastructure-playbooks/dashboard.yml b/infrastructure-playbooks/dashboard.yml
index 679fad1bf..979ed4927 100644
--- a/infrastructure-playbooks/dashboard.yml
+++ b/infrastructure-playbooks/dashboard.yml
@@ -51,8 +51,6 @@
     - import_role:
         name: ceph-facts
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
     - import_role:
         name: ceph-prometheus
     - import_role:
diff --git a/site-container.yml.sample b/site-container.yml.sample
index b0cedb616..6c6e4af7e 100644
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -83,10 +83,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -130,10 +126,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -172,10 +164,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -214,10 +202,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -256,10 +240,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -298,10 +278,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -340,10 +316,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -382,12 +354,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-      when: inventory_hostname == groups.get('clients', ['']) | first
-    - import_role:
-        name: ceph-container-common
-      when: inventory_hostname == groups.get('clients', ['']) | first
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -428,10 +394,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
diff --git a/site.yml.sample b/site.yml.sample
index 2bedfe8fe..6c0c1d345 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -52,6 +52,8 @@
         name: ceph-validate
     - import_role:
         name: ceph-infra
+    - import_role:
+        name: ceph-common
 
 - hosts: mons
   gather_facts: false
@@ -76,8 +78,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -119,8 +119,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -159,8 +157,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -199,8 +195,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -239,8 +233,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -279,8 +271,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -319,8 +309,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -359,8 +347,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -401,8 +387,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']