diff --git a/SOURCES/Rocky-AppStream.repo b/SOURCES/Rocky-AppStream.repo
index e4057223ffc17196fa4ae0673fdc7cd847a69a11..17d0355c583de2468423a932606da356aacdc198 100644
--- a/SOURCES/Rocky-AppStream.repo
+++ b/SOURCES/Rocky-AppStream.repo
@@ -11,7 +11,7 @@
 [appstream]
 name=Rocky Linux $releasever - AppStream
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-BaseOS.repo b/SOURCES/Rocky-BaseOS.repo
index 137da48c18a703c6e3104c1d64ed48574fc123a6..fbdf57d53802c5babb138879e5d16be053b01186 100644
--- a/SOURCES/Rocky-BaseOS.repo
+++ b/SOURCES/Rocky-BaseOS.repo
@@ -11,7 +11,7 @@
 [baseos]
 name=Rocky Linux $releasever - BaseOS
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=BaseOS&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-ContinuousRelease.repo b/SOURCES/Rocky-ContinuousRelease.repo
index 2605eb54167a91618db39f4c7eac5635dcadb5a5..9c1948b23381814b526f9cbcfe73813d64a06d50 100644
--- a/SOURCES/Rocky-ContinuousRelease.repo
+++ b/SOURCES/Rocky-ContinuousRelease.repo
@@ -18,7 +18,7 @@
 [cr]
 name=Rocky Linux $releasever - ContinuousRelease
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=cr&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/cr/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/cr/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Debuginfo.repo b/SOURCES/Rocky-Debuginfo.repo
index 42e8bd0057e41ef4225c05bf6f08f83204f2b464..fb0d0c1f4f27305ba3b07a2dfb78f5ac6bf3c2ce 100644
--- a/SOURCES/Rocky-Debuginfo.repo
+++ b/SOURCES/Rocky-Debuginfo.repo
@@ -5,7 +5,7 @@
 
 [debuginfo]
 name=Rocky Linux $releasever - Debuginfo
-baseurl=http://debuginfo.rockylinux.org/$releasever/$basearch/
+baseurl=http://dl.rockylinux.org/$contentdir/debuginfo/$releasever/$basearch/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Devel.repo b/SOURCES/Rocky-Devel.repo
index 592890c716018c101d94bf8df48715e485b1ddef..03ba3238fbfdfceeaa6e97dd9dff0252009c4cd7 100644
--- a/SOURCES/Rocky-Devel.repo
+++ b/SOURCES/Rocky-Devel.repo
@@ -11,7 +11,7 @@
 [devel]
 name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT USE ONLY!
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=Devel&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Extras.repo b/SOURCES/Rocky-Extras.repo
index 43ca71342b8de487329c75dc47fd61e857d08efe..c49a847df6fe239420fb59a9a506058814c79b31 100644
--- a/SOURCES/Rocky-Extras.repo
+++ b/SOURCES/Rocky-Extras.repo
@@ -11,7 +11,7 @@
 [extras]
 name=Rocky Linux $releasever - Extras
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-FastTrack.repo b/SOURCES/Rocky-FastTrack.repo
index 04ecbfb911ddc69c48722b0c04be167304d3bd42..7af2f0c8ba15e2ff789a5371a195ed17d13f30b7 100644
--- a/SOURCES/Rocky-FastTrack.repo
+++ b/SOURCES/Rocky-FastTrack.repo
@@ -11,7 +11,7 @@
 [fasttrack]
 name=Rocky Linux $releasever - FastTrack
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/fasttrack/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/fasttrack/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-HighAvailability.repo b/SOURCES/Rocky-HighAvailability.repo
index 5c5898b7aef86239f04ce3d4f8d613f361083399..e4e46b4a67255f9cd159bcd1e69347a3de560996 100644
--- a/SOURCES/Rocky-HighAvailability.repo
+++ b/SOURCES/Rocky-HighAvailability.repo
@@ -11,7 +11,7 @@
 [ha]
 name=Rocky Linux $releasever - HighAvailability
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=HighAvailability&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Plus.repo b/SOURCES/Rocky-Plus.repo
index f2c423e315fcea2dc913334e4d4cb14961c6cb06..5e24ddf9d2415ab37c199ed4bab73f6953b020e4 100644
--- a/SOURCES/Rocky-Plus.repo
+++ b/SOURCES/Rocky-Plus.repo
@@ -11,7 +11,7 @@
 [plus]
 name=Rocky Linux $releasever - Plus
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=rockyplus&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/rockyplus/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/rockyplus/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-PowerTools.repo b/SOURCES/Rocky-PowerTools.repo
index 2eb1aa16c3b1498bbb0db7c325d0c556a5822cff..0b16749fc9476619ee73f0d512e04f4890feb016 100644
--- a/SOURCES/Rocky-PowerTools.repo
+++ b/SOURCES/Rocky-PowerTools.repo
@@ -11,7 +11,7 @@
 [powertools]
 name=Rocky Linux $releasever - PowerTools
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-ResilientStorage.repo b/SOURCES/Rocky-ResilientStorage.repo
index a8041d3c3668057d6004803ef4ab0f1f08732a60..1f90816d54662c97bd9f006aa43c2da4f78c4832 100644
--- a/SOURCES/Rocky-ResilientStorage.repo
+++ b/SOURCES/Rocky-ResilientStorage.repo
@@ -11,7 +11,7 @@
 [resilient-storage]
 name=Rocky Linux $releasever - ResilientStorage
 mirrorlist=http://mirrorlist.rockylinux.org/?release=$releasever&arch=$basearch&repo=ResilientStorage&infra=$infra
-#baseurl=http://mirror.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SOURCES/Rocky-Sources.repo b/SOURCES/Rocky-Sources.repo
index b479789a158a774012964cd01c62176fd26beabc..eea8ed4a93e0620e8eafdc4b2adf8a94b9cfa79d 100644
--- a/SOURCES/Rocky-Sources.repo
+++ b/SOURCES/Rocky-Sources.repo
@@ -3,28 +3,28 @@
 
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
-baseurl=http://vault.rockylinux.org/$contentdir/$releasever/BaseOS/Source/
+baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/BaseOS/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
-baseurl=http://vault.rockylinux.org/$contentdir/$releasever/AppStream/Source/
+baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/AppStream/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [extras-source]
 name=Rocky Linux $releasever - Extras - Source
-baseurl=http://vault.rockylinux.org/$contentdir/$releasever/extras/Source/
+baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/extras/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [plus-source]
 name=Rocky Linux $releasever - Plus - Source
-baseurl=http://vault.rockylinux.org/$contentdir/$releasever/rockyplus/Source/
+baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/rockyplus/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 3a250b4d2b6d33ef2d9de957d0acde5d0680ddc2..a705f2a66af3d0619b53cf2691959c0e3874f7a0 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 9
+%define rocky_rel 10
 %define upstream_rel %{major}.%{minor}
 
 %define base_release_version %{major}
@@ -184,7 +184,7 @@ install -m 0644 %{SOURCE302} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
 # dnf stuff
 install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
 echo "stock" > %{buildroot}%{_sysconfdir}/dnf/vars/infra
-echo "rocky" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
+echo "pub/rocky/linux" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
 
 # Copy out GPG keys
 install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
@@ -230,6 +230,10 @@ 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
+- Fix repo URL's where needed
+- Change contentdir var
+
 * Sun Apr 25 2021 Louis Abel <label@rockylinux.org> - 8.3-9
 - Remove and add os-release references