diff --git a/20-grub.install b/20-grub.install
index bb0d5299..aa9272dd 100755
--- a/20-grub.install
+++ b/20-grub.install
@@ -139,7 +139,7 @@ case "$COMMAND" in
                 sed -i -e "s,^initrd.*,initrd ${BOOTPREFIX}${INITRD},g" "${BLS_TARGET}"
             fi
 
-            if [[ "$KERNEL_VERSION" == *\+* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ]; then
+            if [[ "$KERNEL_VERSION" == *\+debug* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ]; then
                 GRUB_UPDATE_DEFAULT_KERNEL=false
             fi
 
diff --git a/grub2.spec b/grub2.spec
index 5817228c..053b6988 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	80%{?dist}
+Release:	81%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -544,6 +544,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Wed Feb 01 2023 Javier Martinez Canillas <javierm@redhat.com> - 2.06-81
+- 20-grub-install: Explicitly check '+debug' suffix for debug kernels
+- Resolves: #2148351
+
 * Wed Feb 01 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-80
 - Bump to re-run signing