diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 5a51ca50ae..d88f7d3a4f 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -219,7 +219,7 @@
   register: max_loop
   always_run: yes
   changed_when: '1 != 1'
-  when: ansible_distribution == 'Fedora' and ansible_architecture == 'x86_64'
+  when: ansible_distribution_major_version != '6' and ansible_architecture == 'x86_64'
   tags:
   - koji_builder
 
@@ -228,7 +228,7 @@
   register: max_loop
   always_run: yes
   changed_when: '1 != 1'
-  when: ansible_distribution == 'RedHat' and ansible_architecture == 'x86_64'
+  when: ansible_distribution == 'RedHat' and ansible_architecture == 'x86_64' and ansible_distribution_major_version == '6'
   tags:
   - koji_builder