diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
index 8efaed0ff..cc8f37159 100644
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
@@ -2,4 +2,14 @@
 - name: enable red hat storage tools repository
   rhsm_repository:
     name: "rhceph-{{ ceph_rhcs_version }}-tools-for-rhel-8-{{ ansible_facts['architecture'] }}-rpms"
-  when: (mgr_group_name in group_names or rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names or iscsi_gw_group_name in group_names or client_group_name in group_names or monitoring_group_name in group_names)
+  when:
+    - mon_group_name in group_names
+      of osd_group_name in group_names
+      or mgr_group_name in group_names
+      or rgw_group_name in group_names
+      or mds_group_name in group_names
+      or nfs_group_name in group_names
+      or iscsi_gw_group_name in group_names
+      or client_group_name in group_names
+      or rbdmirror_group_name in group_names
+      or monitoring_group_name in group_names