diff --git a/.puppet/modules/epel/manifests/init.pp b/.puppet/modules/epel/manifests/init.pp
index 9ec1ba692..2792ff918 100644
--- a/.puppet/modules/epel/manifests/init.pp
+++ b/.puppet/modules/epel/manifests/init.pp
@@ -15,10 +15,10 @@
 class epel {
 
   yumrepo { 'epel':
-    mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=${::architecture}",
+    mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${::operatingsystemmajrelease}&arch=${::architecture}",
     enabled    => '1',
     gpgcheck   => '0',
-    descr      => "Extra Packages for Enterprise Linux 6 - ${::architecture}"
+    descr      => "Extra Packages for Enterprise Linux ${::operatingsystemmajrelease} - ${::architecture}"
   }
 }