diff --git a/src/vendorcode/eltan/security/mboot/Kconfig b/src/vendorcode/eltan/security/mboot/Kconfig
index 91898fc401..540b7b22eb 100644
--- a/src/vendorcode/eltan/security/mboot/Kconfig
+++ b/src/vendorcode/eltan/security/mboot/Kconfig
@@ -10,8 +10,11 @@ config VENDORCODE_ELTAN_MBOOT
 	  Enabling MBOOT will use mboot to measure the components of the firmware
 	  (stages, payload, etc).
 
+if VENDORCODE_ELTAN_MBOOT
+
 config VENDORCODE_ELTAN_CRTM_VERSION_STRING
 	string "default CRTM version"
 	default "default CRTM version"
 
+endif # VENDORCODE_ELTAN_MBOOT
 endmenu # Measured Boot (mboot)
diff --git a/src/vendorcode/eltan/security/verified_boot/Kconfig b/src/vendorcode/eltan/security/verified_boot/Kconfig
index b4d1378d47..7741782650 100644
--- a/src/vendorcode/eltan/security/verified_boot/Kconfig
+++ b/src/vendorcode/eltan/security/verified_boot/Kconfig
@@ -8,6 +8,8 @@ config VENDORCODE_ELTAN_VBOOT
 	default n
 	select VBOOT_LIB
 
+if VENDORCODE_ELTAN_VBOOT
+
 config VENDORCODE_ELTAN_VBOOT_SIGNED_MANIFEST
 	bool "Enable Signed Manifest"
 	depends on VENDORCODE_ELTAN_VBOOT
@@ -52,4 +54,5 @@ config VENDORCODE_ELTAN_VBOOT_KEY_SIZE
 	int
 	default 552
 
+endif # VENDORCODE_ELTAN_VBOOT
 endmenu # Verified Boot (verified_boot)