diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
index 209cb79ca8eca..9be3fa01e0125 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+KERNEL_IUSE_MODULES_SIGN=1
+
 inherit git-r3 kernel-build toolchain-funcs
 
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
@@ -124,5 +126,10 @@ src_prepare() {
 		merge_configs+=( "${dist_conf_path}/big-endian.config" )
 	fi
 
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	# 5.10 series: No ZBOOT, disable explicitly to not confuse the eclass
+	echo "# CONFIG_EFI_ZBOOT is not set" > "${dist_conf_path}/secureboot.config" || die
+
 	kernel-build_merge_configs "${merge_configs[@]}"
 }
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
index fe69a37739e24..792c6233c443e 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+KERNEL_IUSE_MODULES_SIGN=1
+
 inherit git-r3 kernel-build toolchain-funcs
 
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
@@ -128,5 +130,10 @@ src_prepare() {
 		merge_configs+=( "${dist_conf_path}/big-endian.config" )
 	fi
 
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	# 5.15 series: No ZBOOT, disable explicitly to not confuse the eclass
+	echo "# CONFIG_EFI_ZBOOT is not set" > "${dist_conf_path}/secureboot.config" || die
+
 	kernel-build_merge_configs "${merge_configs[@]}"
 }
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
index 96c70f83ad0a0..0c088a200f82c 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+KERNEL_IUSE_MODULES_SIGN=1
+
 inherit git-r3 kernel-build toolchain-funcs
 
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
@@ -130,5 +132,10 @@ src_prepare() {
 		merge_configs+=( "${dist_conf_path}/big-endian.config" )
 	fi
 
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	# 6.1 series: ZBOOT causes hangs in qemu tests, disable for now
+	echo "# CONFIG_EFI_ZBOOT is not set" > "${dist_conf_path}/secureboot.config" || die
+
 	kernel-build_merge_configs "${merge_configs[@]}"
 }