diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index e9e554e986..e585648268 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -37,7 +37,7 @@
   - fedora.repo
   - fedora-updates.repo
   - fedora-updates-testing.repo
-  when: ansible_distribution == 'Fedora' and (ansible_architecture == 'aarch64' or ansible_architecture == 'x86_64' or ansible_architecture == 'i386' or ansible_architecture == 'armv7l') and not inventory_hostname.startswith('arm03') and not inventory_hostname.startswith('wiki01.stg')
+  when: ansible_distribution == 'Fedora' and (ansible_architecture == 'aarch64' or ansible_architecture == 'x86_64' or ansible_architecture == 'i386' or ansible_architecture == 'armv7l') and not inventory_hostname.startswith('arm03') and not inventory_hostname.startswith('wiki01.stg') and ansible_distribution_major_version|int > 27
   tags:
   - config
   - packages
@@ -49,7 +49,7 @@
   - fedora.repo
   - fedora-updates.repo
   - fedora-updates-testing.repo
-  when: ansible_distribution == 'Fedora' and (ansible_architecture == 'ppc64' or ansible_architecture == 'ppc64le' or ansible_architecture == 's390x')
+  when: ansible_distribution == 'Fedora' and (ansible_architecture == 'ppc64' or ansible_architecture == 'ppc64le' or ansible_architecture == 's390x') or (ansible_architecture == 'aarch64' and ansible_distribution_major_version|int < 28)
   tags:
   - config
   - packages