diff --git a/cephadm-preflight.yml b/cephadm-preflight.yml
index 8e9fc79..fbfe50a 100644
--- a/cephadm-preflight.yml
+++ b/cephadm-preflight.yml
@@ -25,6 +25,11 @@
   become: true
   gather_facts: true
   vars:
+    repos_to_disable:
+      - rhceph-4-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
+      - rhceph-4-mon-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
+      - rhceph-4-osd-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
+      - rhceph-5-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
     packages_to_uninstall:
       - ceph-mds
       - ceph-mgr
@@ -49,13 +54,8 @@
 
             - name: disable older rhceph repositories if any
               rhsm_repository:
-                name: "{{ item }}"
+                name: "{{ repos_to_disable }}"
                 state: absent
-              loop:
-                - rhceph-4-tools-for-rhel-8-{{ ansible_facts['architecture'] }}-rpms
-                - rhceph-4-mon-for-rhel-8-{{ ansible_facts['architecture'] }}-rpms
-                - rhceph-4-osd-for-rhel-8-{{ ansible_facts['architecture'] }}-rpms
-              when: ansible_facts['distribution_major_version'] | int == 8
 
         - name: enable ceph package repositories
           when: ceph_origin in ['community', 'ibm']