diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container_red_hat.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container_red_hat.yml
index 49fbb8dcc..a701ffa6a 100644
--- a/roles/ceph-nfs/tasks/pre_requisite_non_container_red_hat.yml
+++ b/roles/ceph-nfs/tasks/pre_requisite_non_container_red_hat.yml
@@ -2,17 +2,30 @@
 - name: red hat based systems - repo handling
   when: ceph_origin == 'repository'
   block:
-    - name: add nfs-ganesha stable repository
-      yum_repository:
-        name: nfs_ganesha_stable
-        description: nfs-ganesha stable repo
-        gpgcheck: yes
-        state: present
-        gpgkey: "{{ ceph_stable_key }}"
-        baseurl: "{{ ceph_mirror }}/nfs-ganesha/rpm-{{ nfs_ganesha_stable_branch }}/{{ ceph_release }}/$basearch"
+    - name: red hat based systems - stable repo related tasks
       when:
         - nfs_ganesha_stable | bool
         - ceph_repository == 'community'
+      block:
+        - name: add nfs-ganesha stable repository
+          yum_repository:
+            name: nfs_ganesha_stable
+            description: nfs-ganesha stable repo
+            gpgcheck: yes
+            state: present
+            gpgkey: "{{ ceph_stable_key }}"
+            baseurl: "{{ ceph_mirror }}/nfs-ganesha/rpm-{{ nfs_ganesha_stable_branch }}/{{ ceph_release }}/el$releasever/$basearch"
+            file: nfs_ganesha_stable
+
+        - name: add nfs-ganesha stable noarch repository
+          yum_repository:
+            name: nfs_ganesha_stable_noarch
+            description: nfs-ganesha stable noarch repo
+            gpgcheck: yes
+            state: present
+            gpgkey: "{{ ceph_stable_key }}"
+            baseurl: "{{ ceph_mirror }}/nfs-ganesha/rpm-{{ nfs_ganesha_stable_branch }}/{{ ceph_release }}/el$releasever/noarch"
+            file: nfs_ganesha_stable
 
     - name: red hat based systems - dev repo related tasks
       block: