diff --git a/SOURCES/Rocky-AppStream.repo b/SOURCES/Rocky-AppStream.repo
index 91b82aa..c6b457e 100644
--- a/SOURCES/Rocky-AppStream.repo
+++ b/SOURCES/Rocky-AppStream.repo
@@ -14,4 +14,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStre
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-BaseOS.repo b/SOURCES/Rocky-BaseOS.repo
index bfea267..b3afce4 100644
--- a/SOURCES/Rocky-BaseOS.repo
+++ b/SOURCES/Rocky-BaseOS.repo
@@ -14,4 +14,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-PowerTools.repo b/SOURCES/Rocky-CRB.repo
similarity index 64%
rename from SOURCES/Rocky-PowerTools.repo
rename to SOURCES/Rocky-CRB.repo
index 53daf96..819761d 100644
--- a/SOURCES/Rocky-PowerTools.repo
+++ b/SOURCES/Rocky-CRB.repo
@@ -1,4 +1,4 @@
-# Rocky-PowerTools.repo
+# Rocky-CRB.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
@@ -8,10 +8,10 @@
 # If the mirrorlist does not work for you, you can try the commented out
 # baseurl line instead.
 
-[powertools]
-name=Rocky Linux $releasever - PowerTools
-mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever
-#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
+[crb]
+name=Rocky Linux $releasever - CRB
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=crb-$releasever
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-ContinuousRelease.repo b/SOURCES/Rocky-ContinuousRelease.repo
index 1bd36de..13a54b5 100644
--- a/SOURCES/Rocky-ContinuousRelease.repo
+++ b/SOURCES/Rocky-ContinuousRelease.repo
@@ -21,4 +21,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=cr-$rel
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/cr/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-Debuginfo.repo b/SOURCES/Rocky-Debuginfo.repo
index 10192d9..4c43dae 100644
--- a/SOURCES/Rocky-Debuginfo.repo
+++ b/SOURCES/Rocky-Debuginfo.repo
@@ -7,7 +7,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 [appstream-debug]
 name=Rocky Linux $releasever - AppStream - Source
@@ -15,7 +15,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStre
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 [ha-debug]
 name=Rocky Linux $releasever - High Availability - Source
@@ -23,7 +23,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAva
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 [powertools-debug]
 name=Rocky Linux $releasever - PowerTools - Source
@@ -31,7 +31,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTo
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 [resilient-storage-debug]
 name=Rocky Linux $releasever - Resilient Storage - Source
@@ -39,5 +39,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Resilie
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
diff --git a/SOURCES/Rocky-Devel.repo b/SOURCES/Rocky-Devel.repo
index 7297c86..4a33427 100644
--- a/SOURCES/Rocky-Devel.repo
+++ b/SOURCES/Rocky-Devel.repo
@@ -7,4 +7,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-Extras.repo b/SOURCES/Rocky-Extras.repo
index 572d566..6614774 100644
--- a/SOURCES/Rocky-Extras.repo
+++ b/SOURCES/Rocky-Extras.repo
@@ -14,4 +14,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-FastTrack.repo b/SOURCES/Rocky-FastTrack.repo
index 84e4f63..dbd876c 100644
--- a/SOURCES/Rocky-FastTrack.repo
+++ b/SOURCES/Rocky-FastTrack.repo
@@ -14,4 +14,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=fasttra
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/fasttrack/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-HighAvailability.repo b/SOURCES/Rocky-HighAvailability.repo
index 8ab4996..54f1a69 100644
--- a/SOURCES/Rocky-HighAvailability.repo
+++ b/SOURCES/Rocky-HighAvailability.repo
@@ -14,4 +14,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAva
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-Media.repo b/SOURCES/Rocky-Media.repo
index 9dabfc0..18ccba1 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-rockyofficial
+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-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-NFV.repo b/SOURCES/Rocky-NFV.repo
index bc9eada..9ea79e0 100644
--- a/SOURCES/Rocky-NFV.repo
+++ b/SOURCES/Rocky-NFV.repo
@@ -14,4 +14,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$re
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/nfv/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-Plus.repo b/SOURCES/Rocky-Plus.repo
index 850c389..40b57d3 100644
--- a/SOURCES/Rocky-Plus.repo
+++ b/SOURCES/Rocky-Plus.repo
@@ -14,4 +14,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockypl
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-RT.repo b/SOURCES/Rocky-RT.repo
index 7f2dd88..fcb7f6f 100644
--- a/SOURCES/Rocky-RT.repo
+++ b/SOURCES/Rocky-RT.repo
@@ -14,4 +14,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$rel
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-ResilientStorage.repo b/SOURCES/Rocky-ResilientStorage.repo
index 15b5290..ed0fe50 100644
--- a/SOURCES/Rocky-ResilientStorage.repo
+++ b/SOURCES/Rocky-ResilientStorage.repo
@@ -14,4 +14,4 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Resilie
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
diff --git a/SOURCES/Rocky-Sources.repo b/SOURCES/Rocky-Sources.repo
index ee1a585..89ca260 100644
--- a/SOURCES/Rocky-Sources.repo
+++ b/SOURCES/Rocky-Sources.repo
@@ -6,7 +6,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$re
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
@@ -14,7 +14,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 #[extras-source]
 #name=Rocky Linux $releasever - Extras - Source
@@ -22,7 +22,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/
 #gpgcheck=1
 #enabled=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 #[plus-source]
 #name=Rocky Linux $releasever - Plus - Source
@@ -30,7 +30,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Plus/source/tree/
 #gpgcheck=1
 #enabled=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 [ha-source]
 name=Rocky Linux $releasever - High Availability - Source
@@ -38,7 +38,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvaila
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 [powertools-source]
 name=Rocky Linux $releasever - PowerTools - Source
@@ -46,7 +46,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=PowerTools
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
 [resilient-storage-source]
 name=Rocky Linux $releasever - Resilient Storage - Source
@@ -54,5 +54,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientS
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/
 gpgcheck=1
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9
 
diff --git a/SOURCES/rocky.1.gz b/SOURCES/rocky.1.gz
index 0b11f4c..1e0aaae 100644
Binary files a/SOURCES/rocky.1.gz and b/SOURCES/rocky.1.gz differ
diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 1d890bb..835ca89 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -71,7 +71,7 @@ Source304:      50-redhat.conf
 # Repo Sources
 Source1200:     Rocky-BaseOS.repo
 Source1201:     Rocky-AppStream.repo
-Source1202:     Rocky-PowerTools.repo
+Source1202:     Rocky-CRB.repo
 Source1203:     Rocky-Extras.repo
 
 # Rocky Add-ons