diff --git a/roles/cloud_compute/files/cloud-epel7.repo b/files/common/epelcloud.repo
similarity index 100%
rename from roles/cloud_compute/files/cloud-epel7.repo
rename to files/common/epelcloud.repo
diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 840673127a..fd93dd502a 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -13,7 +13,7 @@ libdir: /usr/lib64
 # Most EL systems need default EPEL repos.
 # Some systems (notably fed-cloud*) need to get their own
 # EPEL files because EPEL overrides packages in their core repos.
-use_default_epel: true
+epel_customization: none
 
 # example of ports for default iptables
 # tcp_ports: [ 22, 80, 443 ]
diff --git a/inventory/group_vars/cloud-hardware b/inventory/group_vars/cloud-hardware
index f52ccb9a74..b3ab38d15e 100644
--- a/inventory/group_vars/cloud-hardware
+++ b/inventory/group_vars/cloud-hardware
@@ -1,4 +1,4 @@
 ---
 freezes: false
 
-use_default_epel: false
+epel_customization: cloud
diff --git a/roles/cloud_compute/tasks/main.yml b/roles/cloud_compute/tasks/main.yml
index c74b26f23d..6798c47f01 100644
--- a/roles/cloud_compute/tasks/main.yml
+++ b/roles/cloud_compute/tasks/main.yml
@@ -4,10 +4,6 @@
 - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}"
 - template: src={{ files }}/fedora-cloud/hosts dest=/etc/hosts owner=root mode=0644
 
-- name: Copy customized EPEL7 repo
-  copy: src=cloud-epel7.repo dest=/etc/yum.repos.d/cloud-epel7.repo
-        owner=root group=root mode=0644
-
 - name: Enable nested virtualization
   copy: content="options kvm_intel nested=1" dest=/etc/modprobe.d/nested_virt.conf
         owner=root group=root mode=0644
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index 7848db201d..43149c9df4 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -8,8 +8,11 @@
   - yumrepos
 
 - 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') and use_default_epel)
+  action: copy src="{{ item }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version }}.repo"
+  when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
+  with_first_found:
+  - {{ files }}/common/epel{{ epel_customization }}.repo
+  - {{ files }}/common/epel{{ ansible_distribution_major_version }}.repo
   tags:
   - config
   - packages