diff --git a/site-container.yml.sample b/site-container.yml.sample
index 0106654b8..b85f609e3 100644
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -80,6 +80,7 @@
             start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: mons
+  tags: mons
   become: True
   gather_facts: false
   any_errors_fatal: true
@@ -115,6 +116,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: mgrs
+  tags: mgrs
   become: True
   gather_facts: false
   any_errors_fatal: true
@@ -153,6 +155,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: osds
+  tags: osds
   become: True
   gather_facts: false
   any_errors_fatal: true
@@ -191,6 +194,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: mdss
+  tags: mdss
   become: True
   gather_facts: false
   any_errors_fatal: true
@@ -229,6 +233,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: rgws
+  tags: rgws
   become: True
   gather_facts: false
   any_errors_fatal: true
@@ -248,6 +253,13 @@
     - import_role:
         name: ceph-facts
       tags: ['ceph_update_config']
+    - name: multisite specific
+      when: rgw_multisite | bool
+      block:
+        - import_role:
+            name: ceph-validate
+        - import_role:
+            name: ceph-infra
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
@@ -267,6 +279,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: clients
+  tags: clients
   become: True
   gather_facts: false
   any_errors_fatal: true
@@ -306,6 +319,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: nfss
+  tags: nfss
   become: True
   gather_facts: false
   any_errors_fatal: true
@@ -344,6 +358,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: rbdmirrors
+  tags: rbdmirrors
   become: True
   gather_facts: false
   any_errors_fatal: true
@@ -381,8 +396,8 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts:
-    - iscsigws
+- hosts: iscsigws
+  tags: iscsigws
   gather_facts: false
   any_errors_fatal: true
   become: True
diff --git a/site.yml.sample b/site.yml.sample
index efa432990..2557c92e9 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -63,6 +63,7 @@
         name: ceph-common
 
 - hosts: mons
+  tags: mons
   gather_facts: false
   become: True
   any_errors_fatal: true
@@ -104,6 +105,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: mgrs
+  tags: mgrs
   gather_facts: false
   become: True
   any_errors_fatal: true
@@ -142,6 +144,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: osds
+  tags: osds
   gather_facts: false
   become: True
   any_errors_fatal: true
@@ -180,6 +183,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: mdss
+  tags: mdss
   gather_facts: false
   become: True
   any_errors_fatal: true
@@ -218,6 +222,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: rgws
+  tags: rgws
   gather_facts: false
   become: True
   any_errors_fatal: true
@@ -237,6 +242,13 @@
     - import_role:
         name: ceph-facts
       tags: ['ceph_update_config']
+    - name: multisite specific
+      when: rgw_multisite | bool
+      block:
+        - import_role:
+            name: ceph-validate
+        - import_role:
+            name: ceph-infra
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
@@ -256,6 +268,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: clients
+  tags: clients
   gather_facts: false
   become: True
   any_errors_fatal: true
@@ -295,6 +308,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: nfss
+  tags: nfss
   gather_facts: false
   become: True
   any_errors_fatal: true
@@ -333,6 +347,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: rbdmirrors
+  tags: rbdmirrors
   gather_facts: false
   become: True
   any_errors_fatal: true
@@ -370,8 +385,8 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts:
-    - iscsigws
+- hosts: iscsigws
+  tags: iscsigws
   gather_facts: false
   become: True
   any_errors_fatal: true
@@ -409,8 +424,8 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts:
-    - rgwloadbalancers
+- hosts: rgwloadbalancers
+  tags: rgwloadbalancers
   gather_facts: false
   become: True
   any_errors_fatal: true