diff --git a/dashboard.yml b/dashboard.yml
index e647a8e63..d772fad53 100644
--- a/dashboard.yml
+++ b/dashboard.yml
@@ -20,10 +20,12 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-container-engine
+      when: (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
     - import_role:
         name: ceph-container-common
         tasks_from: registry
       when:
+        - (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
         - not containerized_deployment | bool
         - ceph_docker_registry_auth | bool
     - import_role:
diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 1c72846e0..22044c5db 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -88,16 +88,17 @@
     - import_role:
         name: ceph-infra
 
+    - import_role:
+        name: ceph-validate
+
     - import_role:
         name: ceph-container-common
         tasks_from: registry
       when:
+        - (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
         - containerized_deployment | bool
         - ceph_docker_registry_auth | bool
 
-    - import_role:
-        name: ceph-validate
-
     - set_fact: rolling_update=true
 
 - name: upgrade ceph mon cluster
@@ -830,7 +831,9 @@
       when: not containerized_deployment | bool
     - import_role:
         name: ceph-container-common
-      when: containerized_deployment | bool
+      when:
+        - (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
+        - containerized_deployment | bool
     - import_role:
         name: ceph-config
     - import_role: