diff --git a/99-grub-mkconfig.install b/99-grub-mkconfig.install
index 1411f6a..498c454 100755
--- a/99-grub-mkconfig.install
+++ b/99-grub-mkconfig.install
@@ -4,6 +4,12 @@ if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then
     exit 0
 fi
 
+# Run grub2-mkconfig if ENABLE_BLSCFG is false
+if grep -s -q '^GRUB_ENABLE_BLSCFG="*false"*\s*$' /etc/default/grub; then
+    RUN_MKCONFIG=true
+    DISABLE_BLS=true
+fi
+
 # PV and PVH Xen DomU guests boot with pygrub that doesn't have BLS support,
 # also Xen Dom0 use the menuentries from 20_linux_xen and not the ones from
 # 10_linux. So BLS support needs to be disabled for both Xen Dom0 and DomU.
diff --git a/grub2.spec b/grub2.spec
index 101a05c..10971ca 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.12
-Release:	14%{?dist}.alma.1
+Release:	15%{?dist}.alma.1
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPL-3.0-or-later
 URL:		http://www.gnu.org/software/grub/
@@ -574,9 +574,13 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
-* Wed Mar 26 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:2.12-14.alma.1
+* Wed Apr 09 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:2.12-15.alma.1
 - Debrand for AlmaLinux
 
+* Mon Apr 7 2025 Marta Lewandowska <mlewando@redhat.com> - 2.12-15
+- 99-grub-mkconfig.install: Disable BLS and run grub2-mkconfig when GRUB_ENABLE_BLSCFG is disable
+- Resolves: #RHEL-86261
+
 * Tue Mar 25 2025 Nicolas Frayer <nfrayer@redhat.com> 2.12-14
 - ieee1275/ofnet: Fix grub_malloc() removed after added safe
 - Related: #RHEL-80073