diff --git a/SOURCES/Rocky-AppStream.repo b/SOURCES/Rocky-AppStream.repo
index e86434d56df6c473a7910117efde0c9256e8eac3..65353e6296249b7a59bfd6154e600cfa150444d1 100644
--- a/SOURCES/Rocky-AppStream.repo
+++ b/SOURCES/Rocky-AppStream.repo
@@ -10,7 +10,7 @@
 
 [appstream]
 name=Rocky Linux $releasever - AppStream
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
diff --git a/SOURCES/Rocky-BaseOS.repo b/SOURCES/Rocky-BaseOS.repo
index 51952b3549cc08450ec4cfdd0657108fd379fee7..f3fcff49e3a239ddf51d42836f1f7c93f7740a5e 100644
--- a/SOURCES/Rocky-BaseOS.repo
+++ b/SOURCES/Rocky-BaseOS.repo
@@ -10,7 +10,7 @@
 
 [baseos]
 name=Rocky Linux $releasever - BaseOS
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=BaseOS&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
diff --git a/SOURCES/Rocky-ContinuousRelease.repo b/SOURCES/Rocky-ContinuousRelease.repo
index 4886a6503ab1284ad09eee2b0d4f185524be46b6..409ccafd0233b7ef01d3fcee4f4c2333c8966c4c 100644
--- a/SOURCES/Rocky-ContinuousRelease.repo
+++ b/SOURCES/Rocky-ContinuousRelease.repo
@@ -17,7 +17,7 @@
 
 [cr]
 name=Rocky Linux $releasever - ContinuousRelease
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=cr&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=cr-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/cr/$basearch/os/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/Rocky-Devel.repo b/SOURCES/Rocky-Devel.repo
index d5ce0948e313ef21d966c8eed171b87d5243fd23..ed4267cf85e3b5056817fd5ada94692f9193b0f0 100644
--- a/SOURCES/Rocky-Devel.repo
+++ b/SOURCES/Rocky-Devel.repo
@@ -10,7 +10,7 @@
 
 [devel]
 name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT USE ONLY!
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=Devel&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/Rocky-Extras.repo b/SOURCES/Rocky-Extras.repo
index ef7fac41d5a385b8f7178efa78196e67524d9e97..52db7080d06359eff1d937148b6d1f4f13502d97 100644
--- a/SOURCES/Rocky-Extras.repo
+++ b/SOURCES/Rocky-Extras.repo
@@ -10,7 +10,7 @@
 
 [extras]
 name=Rocky Linux $releasever - Extras
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=extras&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1
diff --git a/SOURCES/Rocky-FastTrack.repo b/SOURCES/Rocky-FastTrack.repo
index e04f8a02244a6e945da61c6dcae0b1b745eaaf3a..52d014b2baa6e7a43e5d02039e2b55f0cedb628f 100644
--- a/SOURCES/Rocky-FastTrack.repo
+++ b/SOURCES/Rocky-FastTrack.repo
@@ -10,7 +10,7 @@
 
 [fasttrack]
 name=Rocky Linux $releasever - FastTrack
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=fasttrack-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/fasttrack/$basearch/os/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/Rocky-HighAvailability.repo b/SOURCES/Rocky-HighAvailability.repo
index bfd259c3039623d5b2fe1e341a1512ba081ae43a..04d76455ca5561e9821280d048299888b6ceb883 100644
--- a/SOURCES/Rocky-HighAvailability.repo
+++ b/SOURCES/Rocky-HighAvailability.repo
@@ -10,7 +10,7 @@
 
 [ha]
 name=Rocky Linux $releasever - HighAvailability
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=HighAvailability&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/Rocky-Plus.repo b/SOURCES/Rocky-Plus.repo
index 754c239f8af345863db029602c2264c5500a2590..480be8a21d67d0f16f633dda25e5d74521471266 100644
--- a/SOURCES/Rocky-Plus.repo
+++ b/SOURCES/Rocky-Plus.repo
@@ -10,7 +10,7 @@
 
 [plus]
 name=Rocky Linux $releasever - Plus
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=rockyplus&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/rockyplus/$basearch/os/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/Rocky-PowerTools.repo b/SOURCES/Rocky-PowerTools.repo
index 7d1a48b5e83b2c78f5d6d6bdc2110baa81149e2d..042d04032863c345825b9ee56a0df5b785bad07a 100644
--- a/SOURCES/Rocky-PowerTools.repo
+++ b/SOURCES/Rocky-PowerTools.repo
@@ -10,7 +10,7 @@
 
 [powertools]
 name=Rocky Linux $releasever - PowerTools
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/Rocky-ResilientStorage.repo b/SOURCES/Rocky-ResilientStorage.repo
index 9d700b84722e5d91771f0d1dd141d41329fc8bb1..7510e127c7f792e46ece6af5aea2bd6ffb8866dc 100644
--- a/SOURCES/Rocky-ResilientStorage.repo
+++ b/SOURCES/Rocky-ResilientStorage.repo
@@ -10,7 +10,7 @@
 
 [resilient-storage]
 name=Rocky Linux $releasever - ResilientStorage
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=ResilientStorage&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/Rocky-Sources.repo b/SOURCES/Rocky-Sources.repo
index df0e091b32347af610d55db5308496e8a6102b6c..f798520f199a39591ef0b09bba12569fd299c7c5 100644
--- a/SOURCES/Rocky-Sources.repo
+++ b/SOURCES/Rocky-Sources.repo
@@ -3,7 +3,7 @@
 
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=baseos-source&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=baseos-source-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/BaseOS/Source/
 gpgcheck=1
 enabled=0
@@ -11,7 +11,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=appstream-source&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=appstream-source-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/AppStream/Source/
 gpgcheck=1
 enabled=0
@@ -19,7 +19,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [extras-source]
 name=Rocky Linux $releasever - Extras - Source
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=extras-source&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-source-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/extras/Source/
 gpgcheck=1
 enabled=0
@@ -27,7 +27,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [plus-source]
 name=Rocky Linux $releasever - Plus - Source
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?release=$releasever&arch=$basearch&repo=plus-source&infra=$infra
+mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=plus-source-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/rockyplus/Source/
 gpgcheck=1
 enabled=0
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 955d4cd0ceb921b6055459f5c68979375d017224..a32c642bc8854178d546633d3e3a9c2670dcf8ec 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -9,7 +9,7 @@
 %define distro  Rocky Linux
 %define major   8
 %define minor   3
-%define rocky_rel 10
+%define rocky_rel 11
 %define upstream_rel %{major}.%{minor}
 
 %define base_release_version %{major}
@@ -229,7 +229,7 @@ install -p -m 0644 %{SOURCE1223} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %{_sysconfdir}/pki/rpm-gpg/
 
 %changelog
-* Wed Apr 28 2021 Louis Abel <label@rockylinux.org> - 8.3-10
+* Wed Apr 28 2021 Louis Abel <label@rockylinux.org> - 8.3-11
 - Fix repo URL's where needed
 - Change contentdir var