diff --git a/files/common/epel8.repo b/files/common/epel8.repo
index d57f2afe30..a1785c82f1 100644
--- a/files/common/epel8.repo
+++ b/files/common/epel8.repo
@@ -1,20 +1,13 @@
 [epel]
 name=Extras Packages for Enterprise Linux $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/8/$basearch/
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/8/Everything/$basearch/
 enabled=1
 gpgcheck=1
 gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8
 
 [epel-testing]
 name=Extras Packages for Enterprise Linux $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/testing/8/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8
-
-[epel-beta]
-name=Extras Packages for Enterprise Linux beta $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/beta/8/$basearch/
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/testing/8/Everything/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8