diff --git a/site-container.yml.sample b/site-container.yml.sample
index bf824bdd9..af9c317f2 100644
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -271,6 +271,7 @@
   become: True
   gather_facts: false
   any_errors_fatal: true
+  tags: 'ceph_client'
   tasks:
     # pre-tasks for following imports -
     - name: set ceph client install 'In Progress'
@@ -283,19 +284,18 @@
 
     - import_role:
         name: ceph-defaults
-      tags: ['ceph_update_config', 'ceph_client']
+      tags: ['ceph_update_config']
     - import_role:
         name: ceph-facts
-      tags: ['ceph_update_config', 'ceph_client']
+      tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-      tags: ['ceph_update_config', 'ceph_client']
+      tags: ['ceph_update_config']
     - import_role:
         name: ceph-config
-      tags: ['ceph_update_config', 'ceph_client']
+      tags: ['ceph_update_config']
     - import_role:
         name: ceph-client
-      tags: ['ceph_client']
 
     # post-tasks for preceding imports -
     - name: set ceph client install 'Complete'
diff --git a/site.yml.sample b/site.yml.sample
index ea7e720de..07c2e8bfb 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -260,6 +260,7 @@
   gather_facts: false
   become: True
   any_errors_fatal: true
+  tags: 'ceph_client'
   pre_tasks:
     - name: set ceph client install 'In Progress'
       run_once: true
@@ -272,19 +273,18 @@
   tasks:
     - import_role:
         name: ceph-defaults
-      tags: ['ceph_update_config', 'ceph_client']
+      tags: ['ceph_update_config']
     - import_role:
         name: ceph-facts
-      tags: ['ceph_update_config', 'ceph_client']
+      tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-      tags: ['ceph_update_config', 'ceph_client']
+      tags: ['ceph_update_config']
     - import_role:
         name: ceph-config
-      tags: ['ceph_update_config', 'ceph_client']
+      tags: ['ceph_update_config']
     - import_role:
         name: ceph-client
-      tags: ['ceph_client']
 
   post_tasks:
     - name: set ceph client install 'Complete'