diff --git a/app-emulation/virt-firmware/files/kernel-bootcfg-boot-successful b/app-emulation/virt-firmware/files/kernel-bootcfg-boot-successful
new file mode 100644
index 0000000000000..5c7ef1a79ccf4
--- /dev/null
+++ b/app-emulation/virt-firmware/files/kernel-bootcfg-boot-successful
@@ -0,0 +1,9 @@
+#!/sbin/openrc-run
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="UKI Successful Boot"
+
+start() {
+	kernel-bootcfg --boot-successful --update-csv || return 1
+}
diff --git a/app-emulation/virt-firmware/virt-firmware-24.2.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild
similarity index 89%
rename from app-emulation/virt-firmware/virt-firmware-24.2.ebuild
rename to app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild
index 9fd059ab7234c..60c7279c96366 100644
--- a/app-emulation/virt-firmware/virt-firmware-24.2.ebuild
+++ b/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild
@@ -35,6 +35,7 @@ python_install_all() {
 
 	doman man/*.1
 
+	doinitd "${FILESDIR}/kernel-bootcfg-boot-successful"
 	systemd_dounit systemd/kernel-bootcfg-boot-successful.service
 
 	exeinto /usr/lib/kernel/install.d
@@ -43,5 +44,5 @@ python_install_all() {
 
 pkg_postinst() {
 	optfeature "managing UEFI entries on Unified Kernel Image installation and removal" \
-		"sys-boot/shim sys-kernel/installkernel[systemd]"
+		"sys-boot/shim sys-kernel/installkernel[systemd,uki]"
 }
diff --git a/app-emulation/virt-firmware/virt-firmware-24.2_p20240315.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2_p20240315-r1.ebuild
similarity index 92%
rename from app-emulation/virt-firmware/virt-firmware-24.2_p20240315.ebuild
rename to app-emulation/virt-firmware/virt-firmware-24.2_p20240315-r1.ebuild
index cf1fcb8fc0ef7..5eb358eb6555f 100644
--- a/app-emulation/virt-firmware/virt-firmware-24.2_p20240315.ebuild
+++ b/app-emulation/virt-firmware/virt-firmware-24.2_p20240315-r1.ebuild
@@ -42,6 +42,7 @@ python_install_all() {
 
 	doman man/*.1
 
+	doinitd "${FILESDIR}/kernel-bootcfg-boot-successful"
 	systemd_dounit systemd/kernel-bootcfg-boot-successful.service
 
 	exeinto /usr/lib/kernel/install.d
@@ -50,5 +51,5 @@ python_install_all() {
 
 pkg_postinst() {
 	optfeature "managing UEFI entries on Unified Kernel Image installation and removal" \
-		"sys-kernel/installkernel[systemd]"
+		"sys-kernel/installkernel[systemd,uki]"
 }