diff --git a/salt/common/init.sls b/salt/common/init.sls
index 157f2d49a..3e6774219 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -72,11 +72,6 @@ repair_yumdb:
     - onlyif:
       - 'yum check-update 2>&1 | grep "Error: rpmdb open failed"'
 
-epel:
-  pkg.installed:
-    - skip_suggestions: True
-    - pkgs:
-      - epel-release
 {% endif %}
 
 # Install common packages
diff --git a/setup/so-functions b/setup/so-functions
index 99819e9a9..9adb22b86 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2644,6 +2644,7 @@ update_sudoers() {
 
 update_packages() {
 	if [ "$OS" = 'centos' ]; then
+	    yum repolist >> /dev/null
 		yum -y update >> "$setup_log"
 	else
 		retry 50 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1