diff --git a/SOURCES/Rocky-Debuginfo.repo b/SOURCES/Rocky-Debuginfo.repo
index fb0d0c1..bee7d38 100644
--- a/SOURCES/Rocky-Debuginfo.repo
+++ b/SOURCES/Rocky-Debuginfo.repo
@@ -1,11 +1,43 @@
 # Rocky-Debuginfo.repo
 #
-# All debug packages are merged into a single repo, split by basearch, and are
-# not signed.
 
-[debuginfo]
-name=Rocky Linux $releasever - Debuginfo
-baseurl=http://dl.rockylinux.org/$contentdir/debuginfo/$releasever/$basearch/
+[baseos-debug]
+name=Rocky Linux $releasever - BaseOS - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-debug
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/debug/tree/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+
+[appstream-debug]
+name=Rocky Linux $releasever - AppStream - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-debug
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/debug/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+
+[ha-debug]
+name=Rocky Linux $releasever - High Availability - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-debug
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/debug/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+
+[powertools-debug]
+name=Rocky Linux $releasever - PowerTools - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever-debug
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/debug/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+
+[resilient-storage-debug]
+name=Rocky Linux $releasever - Resilient Storage - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-debug
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/debug/tree/
+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 0d1384c..7297c86 100644
--- a/SOURCES/Rocky-Devel.repo
+++ b/SOURCES/Rocky-Devel.repo
@@ -1,15 +1,8 @@
 # Rocky-Devel.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 Rocky 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.
 
 [devel]
-name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT USE ONLY!
+name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT AND KOJI USE
 mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
 gpgcheck=1
diff --git a/SOURCES/Rocky-Sources.repo b/SOURCES/Rocky-Sources.repo
index 7850037..ee1a585 100644
--- a/SOURCES/Rocky-Sources.repo
+++ b/SOURCES/Rocky-Sources.repo
@@ -2,7 +2,7 @@
 
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$releasever-source
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/
 gpgcheck=1
 enabled=0
@@ -10,31 +10,31 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-$releasever-source
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
-[extras-source]
-name=Rocky Linux $releasever - Extras - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-source
+#[extras-source]
+#name=Rocky Linux $releasever - Extras - Source
+#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=extras-$releasever-source
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+#gpgcheck=1
+#enabled=0
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
-[plus-source]
-name=Rocky Linux $releasever - Plus - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Plus-$releasever-source
+#[plus-source]
+#name=Rocky Linux $releasever - Plus - Source
+#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=plus-$releasever-source
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Plus/source/tree/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+#gpgcheck=1
+#enabled=0
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [ha-source]
 name=Rocky Linux $releasever - High Availability - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvailability-$releasever-source
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/
 gpgcheck=1
 enabled=0
@@ -42,7 +42,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [powertools-source]
 name=Rocky Linux $releasever - PowerTools - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever-source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=PowerTools-$releasever-source
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/source/tree/
 gpgcheck=1
 enabled=0
@@ -50,7 +50,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [resilient-storage-source]
 name=Rocky Linux $releasever - Resilient Storage - Source
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientStorage-$releasever-source
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/
 gpgcheck=1
 enabled=0
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 5bacabe..02adde0 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -10,7 +10,7 @@
 %define distro_code  Green Obsidian
 %define major   8
 %define minor   4
-%define rocky_rel 27
+%define rocky_rel 28
 %define upstream_rel %{major}.%{minor}
 
 %define base_release_version %{major}
@@ -76,7 +76,7 @@ Source1212:     Rocky-RT.repo
 
 # Rocky Special Stuff
 Source1220:     Rocky-Media.repo
-#Source1221:     Rocky-Debuginfo.repo
+Source1221:     Rocky-Debuginfo.repo
 Source1222:     Rocky-Sources.repo
 Source1223:     Rocky-Devel.repo
 Source1226:     Rocky-Plus.repo
@@ -195,6 +195,7 @@ install -p -m 0644 %{SOURCE1211} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1212} %{buildroot}%{_sysconfdir}/yum.repos.d/
 #install -p -m 0644 %{SOURCE1213} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1220} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1221} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1222} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1223} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/
@@ -226,8 +227,9 @@ install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %{_sysconfdir}/pki/rpm-gpg/
 
 %changelog
-* Fri Jun 25 2021 Louis Abel <label@rockylinux.org> - 8.4.27
+* Fri Jun 25 2021 Louis Abel <label@rockylinux.org> - 8.4-28
 - Fix URLs
+- Added debuginfo
 
 * Wed Jun 16 2021 Louis Abel <label@rockylinux.org> - 8.4-25
 - Fix up outstanding issues