diff --git a/20-grub.install b/20-grub.install
index fe7ad8a..a3f1b18 100755
--- a/20-grub.install
+++ b/20-grub.install
@@ -19,6 +19,9 @@ MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
 # If ${BOOT_DIR_ABS} exists, some other boot loader is active.
 [[ -d "${BOOT_DIR_ABS}" ]] && exit 0
 
+# UKIs are BLS type 2 entries, 90-uki-copy.install takes care of them
+[ "x$KERNEL_INSTALL_LAYOUT" != "xuki" ] || exit 0
+
 BLS_DIR="/boot/loader/entries"
 
 mkbls() {
diff --git a/grub2.spec b/grub2.spec
index 6846136..e4029c3 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -16,7 +16,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	73%{?dist}
+Release:	74%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -533,6 +533,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Mon Feb 5 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-74
+- Don't run 20-grub.install for UKIs
+- Resolves: #RHEL-21368
+
 * Thu Jan 4 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-73
 - search command: add flag to only search root dev
 - Resolves: #RHEL-20526