diff --git a/SOURCES/RPM-GPG-KEY-rocky-9 b/SOURCES/RPM-GPG-KEY-Rocky-9
similarity index 100%
rename from SOURCES/RPM-GPG-KEY-rocky-9
rename to SOURCES/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-AppStream.repo b/SOURCES/Rocky-AppStream.repo
index d26566e..bcc1e02 100644
--- a/SOURCES/Rocky-AppStream.repo
+++ b/SOURCES/Rocky-AppStream.repo
@@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [appstream-debug]
 name=Rocky Linux $releasever - AppStream - Debug
@@ -23,7 +23,7 @@ name=Rocky Linux $releasever - AppStream - Debug
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
@@ -31,4 +31,4 @@ name=Rocky Linux $releasever - AppStream - Source
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-BaseOS.repo b/SOURCES/Rocky-BaseOS.repo
index af01a74..4dd19c3 100644
--- a/SOURCES/Rocky-BaseOS.repo
+++ b/SOURCES/Rocky-BaseOS.repo
@@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [baseos-debug]
 name=Rocky Linux $releasever - BaseOS - Debug
@@ -23,7 +23,7 @@ name=Rocky Linux $releasever - BaseOS - Debug
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
@@ -31,4 +31,4 @@ name=Rocky Linux $releasever - BaseOS - Source
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-CRB.repo b/SOURCES/Rocky-CRB.repo
index 026e266..266fa8c 100644
--- a/SOURCES/Rocky-CRB.repo
+++ b/SOURCES/Rocky-CRB.repo
@@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [crb-debug]
 name=Rocky Linux $releasever - CRB - Debug
@@ -23,7 +23,7 @@ name=Rocky Linux $releasever - CRB - Debug
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [crb-source]
 name=Rocky Linux $releasever - CRB - Source
@@ -31,4 +31,4 @@ name=Rocky Linux $releasever - CRB - Source
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-Devel.repo b/SOURCES/Rocky-Devel.repo
index 6f07ea8..9bf8fe4 100644
--- a/SOURCES/Rocky-Devel.repo
+++ b/SOURCES/Rocky-Devel.repo
@@ -8,4 +8,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-Extras.repo b/SOURCES/Rocky-Extras.repo
index bee8541..3682e8c 100644
--- a/SOURCES/Rocky-Extras.repo
+++ b/SOURCES/Rocky-Extras.repo
@@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [extras-debug]
 name=Rocky Linux $releasever - Extras Debug
@@ -23,7 +23,7 @@ name=Rocky Linux $releasever - Extras Debug
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/debug/tree/
 gpgcheck=1
 enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [extras-source]
 name=Rocky Linux $releasever - Extras Source
@@ -31,4 +31,4 @@ name=Rocky Linux $releasever - Extras Source
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/
 gpgcheck=1
 enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-HighAvailability.repo b/SOURCES/Rocky-HighAvailability.repo
index 112ecba..56a0f9a 100644
--- a/SOURCES/Rocky-HighAvailability.repo
+++ b/SOURCES/Rocky-HighAvailability.repo
@@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basea
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [highavailability-debug]
 name=Rocky Linux $releasever - High Availability - Debug
@@ -23,7 +23,7 @@ name=Rocky Linux $releasever - High Availability - Debug
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [highavailability-source]
 name=Rocky Linux $releasever - High Availability - Source
@@ -31,4 +31,4 @@ name=Rocky Linux $releasever - High Availability - Source
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-LH.repo b/SOURCES/Rocky-LH.repo
index e4388d0..88c0081 100644
--- a/SOURCES/Rocky-LH.repo
+++ b/SOURCES/Rocky-LH.repo
@@ -20,7 +20,7 @@ name=Rocky Linux $releasever - LookAhead BaseOS
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/lh/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [lh-appstream]
 name=Rocky Linux $releasever - LookAhead AppStream
@@ -28,7 +28,7 @@ name=Rocky Linux $releasever - LookAhead AppStream
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/lh/AppStream/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [lh-crb]
 name=Rocky Linux $releasever - LookAhead CRB
@@ -36,4 +36,4 @@ name=Rocky Linux $releasever - LookAhead CRB
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/lh/CRB/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-Media.repo b/SOURCES/Rocky-Media.repo
index 18ccba1..dec3136 100644
--- a/SOURCES/Rocky-Media.repo
+++ b/SOURCES/Rocky-Media.repo
@@ -10,7 +10,7 @@ baseurl=file:///media/Rocky/BaseOS
         file:///media/cdrecorder/BaseOS
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [media-appstream]
 name=Rocky Linux $releasever - Media - AppStream
@@ -19,4 +19,4 @@ baseurl=file:///media/Rocky/AppStream
         file:///media/cdrecorder/AppStream
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-NFV.repo b/SOURCES/Rocky-NFV.repo
index f53164e..c2615a1 100644
--- a/SOURCES/Rocky-NFV.repo
+++ b/SOURCES/Rocky-NFV.repo
@@ -15,4 +15,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/nfv/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-Plus.repo b/SOURCES/Rocky-Plus.repo
index 114737c..17da822 100644
--- a/SOURCES/Rocky-Plus.repo
+++ b/SOURCES/Rocky-Plus.repo
@@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [plus-debug]
 name=Rocky Linux $releasever - Plus - Debug
@@ -23,7 +23,7 @@ name=Rocky Linux $releasever - Plus - Debug
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [plus-source]
 name=Rocky Linux $releasever - Plus - Source
@@ -31,4 +31,4 @@ name=Rocky Linux $releasever - Plus - Source
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-RT.repo b/SOURCES/Rocky-RT.repo
index df61d1e..d630226 100644
--- a/SOURCES/Rocky-RT.repo
+++ b/SOURCES/Rocky-RT.repo
@@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [rt-debug]
 name=Rocky Linux $releasever - Realtime Debug
@@ -23,7 +23,7 @@ name=Rocky Linux $releasever - Realtime Debug
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [rt-source]
 name=Rocky Linux $releasever - Realtime Source
@@ -31,5 +31,5 @@ name=Rocky Linux $releasever - Realtime Source
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
diff --git a/SOURCES/Rocky-ResilientStorage.repo b/SOURCES/Rocky-ResilientStorage.repo
index de2ed26..c1c2a81 100644
--- a/SOURCES/Rocky-ResilientStorage.repo
+++ b/SOURCES/Rocky-ResilientStorage.repo
@@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basea
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [resilient-storage-debug]
 name=Rocky Linux $releasever - Resilient Storage - Debug
@@ -23,7 +23,7 @@ name=Rocky Linux $releasever - Resilient Storage - Debug
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [resilient-storage-source]
 name=Rocky Linux $releasever - Resilient Storage - Source
@@ -31,4 +31,4 @@ name=Rocky Linux $releasever - Resilient Storage - Source
 baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SOURCES/Rocky-SAP.repo b/SOURCES/Rocky-SAP.repo
index 54cecf9..e127433 100644
--- a/SOURCES/Rocky-SAP.repo
+++ b/SOURCES/Rocky-SAP.repo
@@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
 [sap-hana]
 name=Rocky Linux $releasever - SAP
@@ -24,4 +24,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/os/
 gpgcheck=1
 enabled=0
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 0350716..37caf7a 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -16,7 +16,7 @@
 %define distro_code  Blue Onyx
 %define major        9
 %define minor        0
-%define rocky_rel    1%{?rllh:.%{rllh}}%{!?rllh:.7}
+%define rocky_rel    1%{?rllh:.%{rllh}}%{!?rllh:.8}
 %define rpm_license  BSD-3-Clause
 %define dist         .el%{major}
 
@@ -107,7 +107,7 @@ Provides:       centos-release-eula = %{version}-%{release}
 Requires:       rocky-repos(%{major})
 
 # GPG Keys (100-199)
-Source101:      RPM-GPG-KEY-rocky-%{major}
+Source101:      RPM-GPG-KEY-Rocky-%{major}
 Source102:      RPM-GPG-KEY-rockytesting
 
 # Release Sources (200-499)
@@ -406,13 +406,14 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
 %{_datadir}/pki/sb-certs/*.crt
 
 %changelog
-* Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.7
+* Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.8
 - Backport current SB certs for now
 - Add logrotate timer and switcheroo
 - Add missing macros
 - Fix CPE values
 - Remove /etc/centos-release
 - Add redhat tags to os-release
+- Fix GPG key names to be consistent with SIG requirements
 
 * Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1
 - Add LOGO to /etc/os-release