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 5a8932137..1b22afda4 100644
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
@@ -35,14 +35,14 @@
   shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms
   changed_when: false
   failed_when: false
-  register: rhcs_rgw_mds_repo
+  register: rhcs_rgw_mds_nfs_repo
   always_run: true
   when:
-    - (rgw_group_name in group_names or mds_group_name in group_names)
+    - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names)
 
 - name: enable red hat storage rados gateway / mds repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms
   changed_when: false
   when:
-    - (rgw_group_name in group_names or mds_group_name in group_names)
-    - rhcs_rgw_mds_repo.rc != 0
+    - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names)
+    - rhcs_rgw_mds_nfs_repo.rc != 0
diff --git a/roles/ceph-common/tasks/installs/redhat_enterprise_repository.yml b/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml
similarity index 100%
rename from roles/ceph-common/tasks/installs/redhat_enterprise_repository.yml
rename to roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml