diff --git a/.etckeeper b/.etckeeper
index 5c525c7..efb271d 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -531,6 +531,7 @@ maybe chmod 0644 'dnf/protected.d/yum.conf'
 maybe chmod 0755 'dnf/vars'
 maybe chmod 0644 'dnf/vars/contentdir'
 maybe chmod 0644 'dnf/vars/infra'
+maybe chmod 0644 'dnf/vars/stream'
 maybe chmod 0755 'docker'
 maybe chmod 0600 'docker/key.json'
 maybe chmod 0755 'dovecot'
@@ -5189,18 +5190,17 @@ maybe chmod 0755 'xml'
 maybe chmod 0644 'xml/catalog'
 maybe chmod 0755 'yum'
 maybe chmod 0755 'yum.repos.d'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-AppStream.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-BaseOS.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-ContinuousRelease.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-Debuginfo.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-Devel.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-Extras.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-FastTrack.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-HighAvailability.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-Media.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-Plus.repo'
-maybe chmod 0640 'yum.repos.d/CentOS-Linux-PowerTools.repo'
-maybe chmod 0644 'yum.repos.d/CentOS-Linux-Sources.repo'
+maybe chmod 0640 'yum.repos.d/CentOS-Linux-PowerTools.repo.rpmsave'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-AppStream.repo'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-BaseOS.repo'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-Debuginfo.repo'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-Extras.repo'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-HighAvailability.repo'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-Media.repo'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-PowerTools.repo'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-RealTime.repo'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-ResilientStorage.repo'
+maybe chmod 0644 'yum.repos.d/CentOS-Stream-Sources.repo'
 maybe chmod 0640 'yum.repos.d/atomic.repo'
 maybe chmod 0640 'yum.repos.d/bestcrypt.repo'
 maybe chmod 0640 'yum.repos.d/docker-ce.repo'
diff --git a/dnf/vars/stream b/dnf/vars/stream
new file mode 100644
index 0000000..481c83e
--- /dev/null
+++ b/dnf/vars/stream
@@ -0,0 +1 @@
+8-stream
diff --git a/yum.repos.d/CentOS-Linux-ContinuousRelease.repo b/yum.repos.d/CentOS-Linux-ContinuousRelease.repo
deleted file mode 100644
index f87284c..0000000
--- a/yum.repos.d/CentOS-Linux-ContinuousRelease.repo
+++ /dev/null
@@ -1,24 +0,0 @@
-# CentOS-Linux-ContinuousRelease.repo
-#
-# The mirrorlist system uses the connecting IP address of the client and the
-# update status of each mirror to pick current mirrors that are geographically
-# close to the client.  You should use this for CentOS updates unless you are
-# manually picking other mirrors.
-#
-# If the mirrorlist does not work for you, you can try the commented out
-# baseurl line instead.
-#
-# The Continuous Release (CR) repository contains packages for the next minor
-# release of CentOS Linux.  This repository only has content in the time period
-# between an upstream release and the official CentOS Linux release.  These
-# packages have not been fully tested yet and should be considered beta
-# quality.  They are made available for people willing to test and provide
-# feedback for the next release.
-
-[cr]
-name=CentOS Linux $releasever - ContinuousRelease
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cr&infra=$infra
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/cr/$basearch/os/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Linux-PowerTools.repo b/yum.repos.d/CentOS-Linux-PowerTools.repo.rpmsave
similarity index 100%
rename from yum.repos.d/CentOS-Linux-PowerTools.repo
rename to yum.repos.d/CentOS-Linux-PowerTools.repo.rpmsave
diff --git a/yum.repos.d/CentOS-Linux-Sources.repo b/yum.repos.d/CentOS-Linux-Sources.repo
deleted file mode 100644
index 84bab25..0000000
--- a/yum.repos.d/CentOS-Linux-Sources.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-# CentOS-Linux-Sources.repo
-
-[baseos-source]
-name=CentOS Linux $releasever - BaseOS - Source
-baseurl=http://vault.centos.org/$contentdir/$releasever/BaseOS/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-
-[appstream-source]
-name=CentOS Linux $releasever - AppStream - Source
-baseurl=http://vault.centos.org/$contentdir/$releasever/AppStream/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-
-[powertools-source]
-name=CentOS Linux $releasever - PowerTools - Source
-baseurl=http://vault.centos.org/$contentdir/$releasever/PowerTools/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-
-[extras-source]
-name=CentOS Linux $releasever - Extras - Source
-baseurl=http://vault.centos.org/$contentdir/$releasever/extras/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-
-[plus-source]
-name=CentOS Linux $releasever - Plus - Source
-baseurl=http://vault.centos.org/$contentdir/$releasever/centosplus/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Linux-AppStream.repo b/yum.repos.d/CentOS-Stream-AppStream.repo
similarity index 64%
rename from yum.repos.d/CentOS-Linux-AppStream.repo
rename to yum.repos.d/CentOS-Stream-AppStream.repo
index 68b6bc8..dfca125 100644
--- a/yum.repos.d/CentOS-Linux-AppStream.repo
+++ b/yum.repos.d/CentOS-Stream-AppStream.repo
@@ -1,4 +1,4 @@
-# CentOS-Linux-AppStream.repo
+# CentOS-Stream-AppStream.repo
 #
 # The mirrorlist system uses the connecting IP address of the client and the
 # update status of each mirror to pick current mirrors that are geographically
@@ -9,9 +9,9 @@
 # baseurl line instead.
 
 [appstream]
-name=CentOS Linux $releasever - AppStream
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/AppStream/$basearch/os/
+name=CentOS Stream $releasever - AppStream
+mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$stream/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Linux-BaseOS.repo b/yum.repos.d/CentOS-Stream-BaseOS.repo
similarity index 65%
rename from yum.repos.d/CentOS-Linux-BaseOS.repo
rename to yum.repos.d/CentOS-Stream-BaseOS.repo
index 55d5c7e..bf14088 100644
--- a/yum.repos.d/CentOS-Linux-BaseOS.repo
+++ b/yum.repos.d/CentOS-Stream-BaseOS.repo
@@ -1,4 +1,4 @@
-# CentOS-Linux-BaseOS.repo
+# CentOS-Stream-BaseOS.repo
 #
 # The mirrorlist system uses the connecting IP address of the client and the
 # update status of each mirror to pick current mirrors that are geographically
@@ -9,9 +9,9 @@
 # baseurl line instead.
 
 [baseos]
-name=CentOS Linux $releasever - BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=BaseOS&infra=$infra
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/BaseOS/$basearch/os/
+name=CentOS Stream $releasever - BaseOS
+mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=BaseOS&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$stream/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Linux-Debuginfo.repo b/yum.repos.d/CentOS-Stream-Debuginfo.repo
similarity index 58%
rename from yum.repos.d/CentOS-Linux-Debuginfo.repo
rename to yum.repos.d/CentOS-Stream-Debuginfo.repo
index e75dc74..fa50de5 100644
--- a/yum.repos.d/CentOS-Linux-Debuginfo.repo
+++ b/yum.repos.d/CentOS-Stream-Debuginfo.repo
@@ -1,11 +1,11 @@
-# CentOS-Linux-Debuginfo.repo
+# CentOS-Stream-Debuginfo.repo
 #
 # All debug packages are merged into a single repo, split by basearch, and are
 # not signed.
 
 [debuginfo]
-name=CentOS Linux $releasever - Debuginfo
-baseurl=http://debuginfo.centos.org/$releasever/$basearch/
+name=CentOS Stream $releasever - Debuginfo
+baseurl=http://debuginfo.centos.org/$stream/$basearch/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Linux-Extras.repo b/yum.repos.d/CentOS-Stream-Extras.repo
similarity index 65%
rename from yum.repos.d/CentOS-Linux-Extras.repo
rename to yum.repos.d/CentOS-Stream-Extras.repo
index 5fff2b5..a2012bd 100644
--- a/yum.repos.d/CentOS-Linux-Extras.repo
+++ b/yum.repos.d/CentOS-Stream-Extras.repo
@@ -1,4 +1,4 @@
-# CentOS-Linux-Extras.repo
+# CentOS-Stream-Extras.repo
 #
 # The mirrorlist system uses the connecting IP address of the client and the
 # update status of each mirror to pick current mirrors that are geographically
@@ -9,9 +9,9 @@
 # baseurl line instead.
 
 [extras]
-name=CentOS Linux $releasever - Extras
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/extras/$basearch/os/
+name=CentOS Stream $releasever - Extras
+mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=extras&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$stream/extras/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Linux-HighAvailability.repo b/yum.repos.d/CentOS-Stream-HighAvailability.repo
similarity index 61%
rename from yum.repos.d/CentOS-Linux-HighAvailability.repo
rename to yum.repos.d/CentOS-Stream-HighAvailability.repo
index c9c38fe..a28828c 100644
--- a/yum.repos.d/CentOS-Linux-HighAvailability.repo
+++ b/yum.repos.d/CentOS-Stream-HighAvailability.repo
@@ -1,4 +1,4 @@
-# CentOS-Linux-HighAvailability.repo
+# CentOS-Stream-HighAvailability.repo
 #
 # The mirrorlist system uses the connecting IP address of the client and the
 # update status of each mirror to pick current mirrors that are geographically
@@ -9,9 +9,9 @@
 # baseurl line instead.
 
 [ha]
-name=CentOS Linux $releasever - HighAvailability
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=HighAvailability&infra=$infra
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/HighAvailability/$basearch/os/
+name=CentOS Stream $releasever - HighAvailability
+mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=HighAvailability&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$stream/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Linux-Media.repo b/yum.repos.d/CentOS-Stream-Media.repo
similarity index 81%
rename from yum.repos.d/CentOS-Linux-Media.repo
rename to yum.repos.d/CentOS-Stream-Media.repo
index b3a56f4..ca81e32 100644
--- a/yum.repos.d/CentOS-Linux-Media.repo
+++ b/yum.repos.d/CentOS-Stream-Media.repo
@@ -1,10 +1,10 @@
-# CentOS-Linux-Media.repo
+# CentOS-Stream-Media.repo
 #
 # You can use this repo to install items directly off the installation media.
 # Verify your mount point matches one of the below file:// paths.
 
 [media-baseos]
-name=CentOS Linux $releasever - Media - BaseOS
+name=CentOS Stream $releasever - Media - BaseOS
 baseurl=file:///media/CentOS/BaseOS
         file:///media/cdrom/BaseOS
         file:///media/cdrecorder/BaseOS
@@ -13,7 +13,7 @@ enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 
 [media-appstream]
-name=CentOS Linux $releasever - Media - AppStream
+name=CentOS Stream $releasever - Media - AppStream
 baseurl=file:///media/CentOS/AppStream
         file:///media/cdrom/AppStream
         file:///media/cdrecorder/AppStream
diff --git a/yum.repos.d/CentOS-Linux-FastTrack.repo b/yum.repos.d/CentOS-Stream-PowerTools.repo
similarity index 62%
rename from yum.repos.d/CentOS-Linux-FastTrack.repo
rename to yum.repos.d/CentOS-Stream-PowerTools.repo
index f3ef4a7..343f10d 100644
--- a/yum.repos.d/CentOS-Linux-FastTrack.repo
+++ b/yum.repos.d/CentOS-Stream-PowerTools.repo
@@ -1,4 +1,4 @@
-# CentOS-Linux-FastTrack.repo
+# CentOS-Stream-PowerTools.repo
 #
 # The mirrorlist system uses the connecting IP address of the client and the
 # update status of each mirror to pick current mirrors that are geographically
@@ -8,10 +8,10 @@
 # If the mirrorlist does not work for you, you can try the commented out
 # baseurl line instead.
 
-[fasttrack]
-name=CentOS Linux $releasever - FastTrack
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/fasttrack/$basearch/os/
+[powertools]
+name=CentOS Stream $releasever - PowerTools
+mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=PowerTools&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$stream/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Linux-Plus.repo b/yum.repos.d/CentOS-Stream-RealTime.repo
similarity index 63%
rename from yum.repos.d/CentOS-Linux-Plus.repo
rename to yum.repos.d/CentOS-Stream-RealTime.repo
index e3740d4..142c562 100644
--- a/yum.repos.d/CentOS-Linux-Plus.repo
+++ b/yum.repos.d/CentOS-Stream-RealTime.repo
@@ -1,4 +1,4 @@
-# CentOS-Linux-Plus.repo
+# CentOS-Stream-RealTime.repo
 #
 # The mirrorlist system uses the connecting IP address of the client and the
 # update status of each mirror to pick current mirrors that are geographically
@@ -8,10 +8,10 @@
 # If the mirrorlist does not work for you, you can try the commented out
 # baseurl line instead.
 
-[plus]
-name=CentOS Linux $releasever - Plus
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/centosplus/$basearch/os/
+[rt]
+name=CentOS Stream $releasever - RealTime
+mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=RT&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$stream/RT/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Linux-Devel.repo b/yum.repos.d/CentOS-Stream-ResilientStorage.repo
similarity index 60%
rename from yum.repos.d/CentOS-Linux-Devel.repo
rename to yum.repos.d/CentOS-Stream-ResilientStorage.repo
index 077b087..c983ec9 100644
--- a/yum.repos.d/CentOS-Linux-Devel.repo
+++ b/yum.repos.d/CentOS-Stream-ResilientStorage.repo
@@ -1,4 +1,4 @@
-# CentOS-Linux-Devel.repo
+# CentOS-Stream-ResilientStorage.repo
 #
 # The mirrorlist system uses the connecting IP address of the client and the
 # update status of each mirror to pick current mirrors that are geographically
@@ -8,10 +8,10 @@
 # If the mirrorlist does not work for you, you can try the commented out
 # baseurl line instead.
 
-[devel]
-name=CentOS Linux $releasever - Devel WARNING! FOR BUILDROOT USE ONLY!
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=Devel&infra=$infra
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/Devel/$basearch/os/
+[resilientstorage]
+name=CentOS Stream $releasever - ResilientStorage
+mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=ResilientStorage&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$stream/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/yum.repos.d/CentOS-Stream-Sources.repo b/yum.repos.d/CentOS-Stream-Sources.repo
new file mode 100644
index 0000000..ed510fd
--- /dev/null
+++ b/yum.repos.d/CentOS-Stream-Sources.repo
@@ -0,0 +1,50 @@
+# CentOS-Stream-Sources.repo
+
+[baseos-source]
+name=CentOS Stream $releasever - BaseOS - Source
+baseurl=http://vault.centos.org/$contentdir/$stream/BaseOS/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+[appstream-source]
+name=CentOS Stream $releasever - AppStream - Source
+baseurl=http://vault.centos.org/$contentdir/$stream/AppStream/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+[powertools-source]
+name=CentOS Stream $releasever - PowerTools - Source
+baseurl=http://vault.centos.org/$contentdir/$stream/PowerTools/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+[extras-source]
+name=CentOS Stream $releasever - Extras - Source
+baseurl=http://vault.centos.org/$contentdir/$stream/extras/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+[ha-source]
+name=CentOS Stream $releasever - HighAvailability - Source
+baseurl=http://vault.centos.org/$contentdir/$stream/HighAvailability/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+[rt-source]
+name=CentOS Stream $releasever - RT - Source
+baseurl=http://vault.centos.org/$contentdir/$stream/RT/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+[resilientstorage-source]
+name=CentOS Stream $releasever - ResilientStorage - Source
+baseurl=http://vault.centos.org/$contentdir/$stream/ResilientStorage/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial