diff --git a/SOURCES/redhatsecureboot301.cer b/SOURCES/redhatsecureboot301.cer
deleted file mode 100644
index 4ff8b79e6736e566dbf39603e0887a53345aa4e4..0000000000000000000000000000000000000000
Binary files a/SOURCES/redhatsecureboot301.cer and /dev/null differ
diff --git a/SOURCES/redhatsecureboot502.cer b/SOURCES/redhatsecureboot502.cer
deleted file mode 100644
index be0b5e211ccf8ad7ba74c88841c921cfdbad5a70..0000000000000000000000000000000000000000
Binary files a/SOURCES/redhatsecureboot502.cer and /dev/null differ
diff --git a/SOURCES/redhatsecurebootca3.cer b/SOURCES/redhatsecurebootca3.cer
deleted file mode 100644
index b2354007b9668258683b99a68fa5bdd3067c31b1..0000000000000000000000000000000000000000
Binary files a/SOURCES/redhatsecurebootca3.cer and /dev/null differ
diff --git a/SOURCES/redhatsecurebootca5.cer b/SOURCES/redhatsecurebootca5.cer
deleted file mode 100644
index dfb0284954861282d1a0ce16c8c5cdc71c27659f..0000000000000000000000000000000000000000
Binary files a/SOURCES/redhatsecurebootca5.cer and /dev/null differ
diff --git a/SOURCES/rockylinuxbootsigningca101test.cer b/SOURCES/rockylinuxbootsigningca101test.cer
new file mode 100644
index 0000000000000000000000000000000000000000..69c899b358d0672c3014b0a08e3b33bdb7159630
Binary files /dev/null and b/SOURCES/rockylinuxbootsigningca101test.cer differ
diff --git a/SOURCES/rockylinuxbootsigningcert101test.cer b/SOURCES/rockylinuxbootsigningcert101test.cer
new file mode 100644
index 0000000000000000000000000000000000000000..0de85b04ed0599c3052ca99a81488ef53e89c05a
Binary files /dev/null and b/SOURCES/rockylinuxbootsigningcert101test.cer differ
diff --git a/SOURCES/sbat.csv.in b/SOURCES/sbat.csv.in
index 24545c0cfe044c6d31dfc93d03480d92c4d8bc81..cdfc7f280af95ea8586e33bb3ae2dd8ebcd358a8 100755
--- a/SOURCES/sbat.csv.in
+++ b/SOURCES/sbat.csv.in
@@ -1,3 +1,3 @@
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
grub,1,Free Software Foundation,grub,2.02,https://www.gnu.org/software/grub/
-grub.rhel8,1,Red Hat Enterprise Linux 8,grub2,@@VERSION@@,mail:secalert@redhat.com
\ No newline at end of file
+grub.rocky8,1,Rocky Linux 8,grub2,@@VERSION@@,mail:security@rockylinux.org
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 59bdb80e28ccf419812bf80ab1da2bd5ce965567..e0fb02a6b621bb49bbde4ec34d40b676a34744c7 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -24,11 +24,9 @@ Source6: gitignore
Source8: strtoull_test.c
Source9: 20-grub.install
Source12: 99-grub-mkconfig.install
-Source13: redhatsecurebootca3.cer
-Source14: redhatsecureboot301.cer
-Source15: redhatsecurebootca5.cer
-Source16: redhatsecureboot502.cer
-Source17: sbat.csv.in
+Source13: rockylinuxbootsigningca101test.cer
+Source14: rockylinuxbootsigningcert101test.cer
+Source15: sbat.csv.in
%include %{SOURCE1}
@@ -150,7 +148,7 @@ This subpackage provides tools for support of all platforms.
mkdir grub-%{grubefiarch}-%{tarversion}
grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubefiarch}-%{tarversion}/.gitignore
cp %{SOURCE4} grub-%{grubefiarch}-%{tarversion}/unifont.pcf.gz
-sed -e "s,@@VERSION@@,%{evr},g" %{SOURCE17} \
+sed -e "s,@@VERSION@@,%{evr},g" %{SOURCE15} \
> grub-%{grubefiarch}-%{tarversion}/sbat.csv
git add grub-%{grubefiarch}-%{tarversion}
%endif
@@ -170,10 +168,10 @@ git commit -m "After making subdirs"
%build
%if 0%{with_efi_arch}
-%{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags} %{SOURCE13} %{SOURCE14} redhatsecureboot301 %{SOURCE15} %{SOURCE16} redhatsecureboot502}
+%{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags} %{SOURCE13} %{SOURCE14} rockylinuxbootsigningcert101test}
%endif
%if 0%{with_alt_efi_arch}
-%{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags} %{SOURCE13} %{SOURCE14} redhatsecureboot301 %{SOURCE15} %{SOURCE16} redhatsecureboot502}
+%{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags} %{SOURCE13} %{SOURCE14} rockylinuxbootsigningcert101test}
%endif
%if 0%{with_legacy_arch}
%{expand:%do_legacy_build %%{grublegacyarch}}
@@ -504,7 +502,10 @@ fi
%endif
%changelog
-* Mon Mar 15 2021 Rich Alloway <ralloway@perforce.com> - 2.02-90
+* Sun Apr 11 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-90
+- Adding Rocky testing CA, CERT and sbat files
+
+* Sun Apr 11 2021 Rich Alloway <ralloway@perforce.com> - 2.02-90
- Apply Rocky Linux debranding changes
* Thu Feb 25 2021 Javier Martinez Canillas <javierm@redhat.com> - 2.02-90.el8_3.1