diff --git a/files/common/rhel8.repo b/files/common/rhel8.repo
index 5637f0ba21..162848d727 100644
--- a/files/common/rhel8.repo
+++ b/files/common/rhel8.repo
@@ -1,19 +1,27 @@
-[rhel8-beta-dvd]
-name = rhel8 beta base dvd
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel-8.0-beta-1-$basearch/
+[rhel8-dvd-BaseOS]
+name = rhel8 baseos dvd
+baseurl=https://infrastructure.fedoraproject.org/repo/rhel/RHEL8.0-$basearch/BaseOS
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled=1
+gpgcheck=1
 
-[rhel8-beta-BaseOS]
-name = rhel8 beta BaseOS $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel8-beta/x86_64/rhel-8-for-x86_64-baseos-beta-rpms
+[rhel8-dvd-AppStream]
+name = rhel8 AppStream dvd
+baseurl=https://infrastructure.fedoraproject.org/repo/rhel/RHEL8.0-$basearch/AppStream
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled=1
+gpgcheck=1
 
-[rhel8-beta-ha]
-name = rhel8 beta ha $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel8-beta/x86_64/rhel-8-for-x86_64-ha-beta-rpms
+[rhel8-BaseOS]
+name = rhel8 BaseOS $basearch
+baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel8/$basearch/rhel-8-for-$basearch-baseos-rpms
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled=1
+gpgcheck=1
 
-[rhel8-beta-appstream]
-name = rhel8 beta appstream $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel8-beta/x86_64/rhel-8-for-x86_64-appstream-beta-rpms
+[rhel8-AppStream]
+name = rhel8 AppStream $basearch
+baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel8/$basearch/rhel-8-for-$basearch-appstream-rpms
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled=1
+gpgcheck=1