diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index 3911978daa..06895f11c8 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -1,21 +1,15 @@
 ---
-- name: put rhel repos on rhel6 systems
-  action: copy src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
-  with_items:
-  - epel6.repo
-  - rhel6.repo
-  when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and ansible_distribution_major_version|int == 6
+- name: put rhel repos on rhel systems
+  action: copy src="{{ files }}/common/rhel{{ ansible_distribution_major_version }}.repo" dest="/etc/yum.repos.d/rhel{{ ansible_distribution_major_version }}.repo"
+  when: ansible_distribution == 'RedHat'
   tags:
   - config
   - packages
   - yumrepos
 
-- name: put rhel repos on rhel7 systems
-  action: copy src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
-  with_items:
-  - epel7.repo
-  - rhel7.repo
-  when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and ansible_distribution_major_version|int == 7
+- name: put epel repos on el systems
+  action: copy src="{{ files }}/common/epel{{ ansible_distribution_major_version }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version }}.repo"
+  when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
   tags:
   - config
   - packages