diff --git a/roles/ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml b/roles/ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml
index 579afd6aa..ac7278c87 100644
--- a/roles/ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml
+++ b/roles/ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml
@@ -4,14 +4,41 @@
   register: subscription
   changed_when: false
 
+- name: check if the red hat storage monitor repo is already present
+  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-1.3-mon-rpms
+  changed_when: false
+  register: rh_storage_mon_repo
+  when: mon_group_name in group_names
+
 - name: enable red hat storage monitor repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-1.3-mon-rpms
-  when: mon_group_name in group_names
+  changed_when: false
+  when:
+    mon_group_name in group_names and
+    rh_storage_mon_repo.rc != 0
+
+- name: check if the red hat storage osd repo is already present
+  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-1.3-osd-rpms
+  changed_when: false
+  register: rh_storage_osd_repo
+  when: osd_group_name in group_names
 
 - name: enable red hat storage osd repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-1.3-osd-rpms
-  when: osd_group_name in group_names
+  changed_when: false
+  when:
+    osd_group_name in group_names and
+    rh_storage_osd_repo.rc != 0
+
+- name: check if the red hat storage rados gateway repo is already present
+  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-1.3-tools-rpms
+  changed_when: false
+  register: rh_storage_rgw_repo
+  when: rgw_group_name in group_names
 
 - name: enable red hat storage rados gateway repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-1.3-tools-rpms
-  when: rgw_group_name in group_names
+  changed_when: false
+  when:
+    rgw_group_name in group_names and
+    rh_storage_rgw_repo.rc != 0
diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 469946259..acfcb0ef4 100644
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -142,7 +142,7 @@
 {% endfor %}
 {% endif %}
 
-{% if groups[mds_group_name] is defined %}
+{% if groups[rgw_group_name] is defined %}
 {% for host in groups[rgw_group_name] %}
 {% if hostvars[host]['ansible_hostname'] is defined %}
 [client.rgw.{{ hostvars[host]['ansible_hostname'] }}]