diff --git a/SOURCES/rocky-addons.repo b/SOURCES/rocky-addons.repo
index 4c19c3d..8bb0f17 100644
--- a/SOURCES/rocky-addons.repo
+++ b/SOURCES/rocky-addons.repo
@@ -10,8 +10,8 @@
 
 [highavailability]
 name=Rocky Linux $releasever - High Availability
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
@@ -21,8 +21,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [highavailability-debug]
 name=Rocky Linux $releasever - High Availability - Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -31,8 +31,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [highavailability-source]
 name=Rocky Linux $releasever - High Availability - Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvailability-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvailability-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -41,8 +41,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [resilientstorage]
 name=Rocky Linux $releasever - Resilient Storage
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
@@ -52,8 +52,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [resilientstorage-debug]
 name=Rocky Linux $releasever - Resilient Storage - Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -62,8 +62,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [resilientstorage-source]
 name=Rocky Linux $releasever - Resilient Storage - Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientStorage-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientStorage-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -72,8 +72,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [nfv]
 name=Rocky Linux $releasever - NFV
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
@@ -83,8 +83,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [nfv-debug]
 name=Rocky Linux $releasever - NFV Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -93,8 +93,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [nfv-source]
 name=Rocky Linux $releasever - NFV Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -103,8 +103,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [rt]
 name=Rocky Linux $releasever - Realtime
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
@@ -114,8 +114,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [rt-debug]
 name=Rocky Linux $releasever - Realtime Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -124,8 +124,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [rt-source]
 name=Rocky Linux $releasever - Realtime Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -134,8 +134,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [sap]
 name=Rocky Linux $releasever - SAP
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
@@ -145,8 +145,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [sap-debug]
 name=Rocky Linux $releasever - SAP Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -155,8 +155,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [sap-source]
 name=Rocky Linux $releasever - SAP Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -165,8 +165,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [saphana]
 name=Rocky Linux $releasever - SAPHANA
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
@@ -176,8 +176,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [saphana-debug]
 name=Rocky Linux $releasever - SAPHANA Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -186,8 +186,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [saphana-source]
 name=Rocky Linux $releasever - SAPHANA Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
diff --git a/SOURCES/rocky-devel.repo b/SOURCES/rocky-devel.repo
index c602e0e..ab95324 100644
--- a/SOURCES/rocky-devel.repo
+++ b/SOURCES/rocky-devel.repo
@@ -4,8 +4,8 @@
 
 [devel]
 name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT ONLY DO NOT LEAVE ENABLED
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=devel-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/devel/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=devel-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/devel/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
diff --git a/SOURCES/rocky-extras.repo b/SOURCES/rocky-extras.repo
index 0defceb..d236ea9 100644
--- a/SOURCES/rocky-extras.repo
+++ b/SOURCES/rocky-extras.repo
@@ -10,8 +10,8 @@
 
 [extras]
 name=Rocky Linux $releasever - Extras
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1
 countme=1
@@ -21,8 +21,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [extras-debug]
 name=Rocky Linux $releasever - Extras Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -31,8 +31,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [extras-source]
 name=Rocky Linux $releasever - Extras Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -41,8 +41,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [plus]
 name=Rocky Linux $releasever - Plus
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
@@ -52,8 +52,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [plus-debug]
 name=Rocky Linux $releasever - Plus - Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -62,8 +62,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [plus-source]
 name=Rocky Linux $releasever - Plus - Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=rockyplus-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=rockyplus-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
diff --git a/SOURCES/rocky.repo b/SOURCES/rocky.repo
index 8d8b8cb..250ec24 100644
--- a/SOURCES/rocky.repo
+++ b/SOURCES/rocky.repo
@@ -10,8 +10,8 @@
 
 [baseos]
 name=Rocky Linux $releasever - BaseOS
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
 countme=1
@@ -21,8 +21,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [baseos-debug]
 name=Rocky Linux $releasever - BaseOS - Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -31,8 +31,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -41,8 +41,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [appstream]
 name=Rocky Linux $releasever - AppStream
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
 countme=1
@@ -52,8 +52,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [appstream-debug]
 name=Rocky Linux $releasever - AppStream - Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -62,8 +62,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -72,8 +72,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [crb]
 name=Rocky Linux $releasever - CRB
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/os/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
@@ -83,8 +83,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [crb-debug]
 name=Rocky Linux $releasever - CRB - Debug
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever-debug&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/debug/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever-debug&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
@@ -93,8 +93,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [crb-source]
 name=Rocky Linux $releasever - CRB - Source
-#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=CRB-$releasever-source&rltype=$rltype
-baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/source/tree/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=CRB-$releasever-source&rltype=$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/source/tree/
 gpgcheck=1
 enabled=0
 metadata_expire=6h
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 3aeed58..b397cfd 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -20,7 +20,7 @@
 %define distro_code  Blue Onyx
 %define major        9
 %define minor        0
-%define rocky_rel    1%{?rllh:.%{rllh}}%{!?rllh:.21}
+%define rocky_rel    1%{?rllh:.%{rllh}}%{!?rllh:.22}
 %define rpm_license  BSD-3-Clause
 %define dist         .el%{major}
 
@@ -416,6 +416,9 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
 %{_datadir}/pki/sb-certs/*
 
 %changelog
+* Wed Jun 22 2022 Louis Abel <label@rockylinux.org> - 9.0-1.22
+- Change to using mirrorlist
+
 * Sun Jun 12 2022 Louis Abel <label@rockylinux.org> - 9.0-1.21
 - Backport current SB certs for now
 - Add logrotate timer and switcheroo