diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index 65172f9..d559c59 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:.4}
+%define rocky_rel    1%{?rllh:.%{rllh}}%{!?rllh:.5}
 %define rpm_license  BSD-3-Clause
 %define dist         .el%{major}
 
@@ -227,7 +227,7 @@ PLATFORM_ID="platform:el%{major}"
 PRETTY_NAME="%{distro_name} %{full_release_version}%{?rlstatement: %{rlstatement}} (%{distro_code})"
 ANSI_COLOR="0;32"
 LOGO="fedora-logo-icon"
-CPE_NAME="cpe:/o:rocky:rocky:%{base_release_version}"
+CPE_NAME="cpe:/o:rocky:rocky:%{major}::baseos"
 HOME_URL="https://rockylinux.org/"
 BUG_REPORT_URL="https://bugs.rockylinux.org/"
 ROCKY_SUPPORT_PRODUCT="%{distro_name}"
@@ -238,7 +238,7 @@ EOF
 ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release
 
 # write cpe to /etc/system/release-cpe
-echo "cpe:/o:rocky:rocky:%{base_release_version}" > %{buildroot}%{_sysconfdir}/system-release-cpe
+echo "cpe:/o:rocky:rocky:%{major}::baseos" > %{buildroot}%{_sysconfdir}/system-release-cpe
 
 # create /etc/issue and /etc/issue.net, /etc/issue.d
 echo '\S' > %{buildroot}%{_sysconfdir}/issue
@@ -405,10 +405,11 @@ 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.4
+* Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.5
 - Backport current SB certs for now
 - Add logrotate timer and switcheroo
 - Add missing macros
+- Fix CPE values
 
 * Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1
 - Add LOGO to /etc/os-release