diff --git a/packstack/plugins/puppet_950.py b/packstack/plugins/puppet_950.py
index dd9d59767..31831994d 100644
--- a/packstack/plugins/puppet_950.py
+++ b/packstack/plugins/puppet_950.py
@@ -62,9 +62,6 @@ def installpuppet():
     for hostname in gethostlist(controller.CONF):
         server = utils.ScriptRunner(hostname)
         server.append("rpm -q puppet || yum install -y puppet")
-        # disable epel if on rhel
-        if controller.CONF["CONFIG_USE_EPEL"] == 'n':
-            server.append("grep 'Red Hat Enterprise Linux' /etc/redhat-release && sed -i -e 's/enabled=1/enabled=0/g' /etc/yum.repos.d/epel.repo || echo -n ''")
         server.execute()
 
 def copyPuppetModules():
diff --git a/packstack/plugins/serverprep_901.py b/packstack/plugins/serverprep_901.py
index 6f9482767..1db43fb3c 100644
--- a/packstack/plugins/serverprep_901.py
+++ b/packstack/plugins/serverprep_901.py
@@ -65,8 +65,9 @@ def serverprep():
             hostname = hostname.split('/')[0]
         server = utils.ScriptRunner(hostname)
 
-        # install epel if on rhel
-        server.append("grep 'Red Hat Enterprise Linux' /etc/redhat-release && ( rpm -q epel-release-6-7 || rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-7.noarch.rpm ) || echo -n ''")
+        # install epel if on rhel and epel is configured
+        if controller.CONF["CONFIG_USE_EPEL"] == 'y':
+            server.append("grep 'Red Hat Enterprise Linux' /etc/redhat-release && ( rpm -q epel-release || rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-7.noarch.rpm ) || echo -n ''")
         server.append("mkdir -p %s"%basedefs.PUPPET_MANIFEST_DIR)
         server.execute()