diff --git a/SOURCES/RPM-GPG-KEY-Rocky-9-Beta b/SOURCES/RPM-GPG-KEY-Rocky-9-Testing
similarity index 100%
rename from SOURCES/RPM-GPG-KEY-Rocky-9-Beta
rename to SOURCES/RPM-GPG-KEY-Rocky-9-Testing
diff --git a/SOURCES/rocky-addons.repo b/SOURCES/rocky-addons.repo
index 5b8a133..4c19c3d 100644
--- a/SOURCES/rocky-addons.repo
+++ b/SOURCES/rocky-addons.repo
@@ -17,6 +17,7 @@ enabled=0
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [highavailability-debug]
 name=Rocky Linux $releasever - High Availability - Debug
@@ -26,6 +27,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [highavailability-source]
 name=Rocky Linux $releasever - High Availability - Source
@@ -35,6 +37,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [resilientstorage]
 name=Rocky Linux $releasever - Resilient Storage
@@ -45,6 +48,7 @@ enabled=0
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [resilientstorage-debug]
 name=Rocky Linux $releasever - Resilient Storage - Debug
@@ -54,6 +58,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [resilientstorage-source]
 name=Rocky Linux $releasever - Resilient Storage - Source
@@ -63,6 +68,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [nfv]
 name=Rocky Linux $releasever - NFV
@@ -73,6 +79,7 @@ enabled=0
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [nfv-debug]
 name=Rocky Linux $releasever - NFV Debug
@@ -82,6 +89,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [nfv-source]
 name=Rocky Linux $releasever - NFV Source
@@ -91,6 +99,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [rt]
 name=Rocky Linux $releasever - Realtime
@@ -101,6 +110,7 @@ enabled=0
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [rt-debug]
 name=Rocky Linux $releasever - Realtime Debug
@@ -110,6 +120,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [rt-source]
 name=Rocky Linux $releasever - Realtime Source
@@ -119,6 +130,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [sap]
 name=Rocky Linux $releasever - SAP
@@ -129,6 +141,7 @@ enabled=0
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [sap-debug]
 name=Rocky Linux $releasever - SAP Debug
@@ -138,6 +151,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [sap-source]
 name=Rocky Linux $releasever - SAP Source
@@ -147,6 +161,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [saphana]
 name=Rocky Linux $releasever - SAPHANA
@@ -157,6 +172,7 @@ enabled=0
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [saphana-debug]
 name=Rocky Linux $releasever - SAPHANA Debug
@@ -166,6 +182,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [saphana-source]
 name=Rocky Linux $releasever - SAPHANA Source
@@ -175,3 +192,4 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
diff --git a/SOURCES/rocky-devel.repo b/SOURCES/rocky-devel.repo
index 49d0598..2825a64 100644
--- a/SOURCES/rocky-devel.repo
+++ b/SOURCES/rocky-devel.repo
@@ -10,6 +10,7 @@ gpgcheck=1
 enabled=0
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [nplb]
 name=Rocky Linux $releasever - NPLB - WARNING! DO NOT LEAVE PERMANENTLY ENABLED
@@ -19,3 +20,4 @@ gpgcheck=1
 enabled=0
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
diff --git a/SOURCES/rocky-extras.repo b/SOURCES/rocky-extras.repo
index 6cfbe2e..0defceb 100644
--- a/SOURCES/rocky-extras.repo
+++ b/SOURCES/rocky-extras.repo
@@ -17,6 +17,7 @@ enabled=1
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [extras-debug]
 name=Rocky Linux $releasever - Extras Debug
@@ -26,6 +27,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [extras-source]
 name=Rocky Linux $releasever - Extras Source
@@ -35,6 +37,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [plus]
 name=Rocky Linux $releasever - Plus
@@ -45,6 +48,7 @@ enabled=0
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [plus-debug]
 name=Rocky Linux $releasever - Plus - Debug
@@ -54,6 +58,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [plus-source]
 name=Rocky Linux $releasever - Plus - Source
@@ -63,3 +68,4 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
diff --git a/SOURCES/rocky.repo b/SOURCES/rocky.repo
index 148f967..8d8b8cb 100644
--- a/SOURCES/rocky.repo
+++ b/SOURCES/rocky.repo
@@ -17,6 +17,7 @@ enabled=1
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [baseos-debug]
 name=Rocky Linux $releasever - BaseOS - Debug
@@ -26,6 +27,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
@@ -35,6 +37,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [appstream]
 name=Rocky Linux $releasever - AppStream
@@ -45,6 +48,7 @@ enabled=1
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [appstream-debug]
 name=Rocky Linux $releasever - AppStream - Debug
@@ -54,6 +58,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
@@ -63,6 +68,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [crb]
 name=Rocky Linux $releasever - CRB
@@ -73,6 +79,7 @@ enabled=0
 countme=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [crb-debug]
 name=Rocky Linux $releasever - CRB - Debug
@@ -82,6 +89,7 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
 
 [crb-source]
 name=Rocky Linux $releasever - CRB - Source
@@ -91,3 +99,4 @@ gpgcheck=1
 enabled=0
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 48fdd75..ff1b27f 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -110,7 +110,7 @@ Requires:       rocky-repos(%{major})
 
 # GPG Keys (100-199)
 Source101:      RPM-GPG-KEY-Rocky-%{major}
-Source102:      RPM-GPG-KEY-Rocky-%{major}-Beta
+Source102:      RPM-GPG-KEY-Rocky-%{major}-Testing
 
 # Release Sources (200-499)
 Source200:      EULA
@@ -415,8 +415,9 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
 - Add redhat and fix rocky tags in os-release
 - Fix GPG key names to be consistent with SIG requirements
 - Reduce number of repo files
-- Change testing key to "beta" key from build system
+- Change testing key to "testing" key from build system
 - Add official "stable" key from build system
+- List both GPG keys in repo files
 
 * Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1
 - Add LOGO to /etc/os-release