diff --git a/src/mainboard/intel/elkhartlake_crb/Kconfig b/src/mainboard/intel/elkhartlake_crb/Kconfig
index 85261601de..e5915eea04 100644
--- a/src/mainboard/intel/elkhartlake_crb/Kconfig
+++ b/src/mainboard/intel/elkhartlake_crb/Kconfig
@@ -35,8 +35,17 @@ config DIMM_SPD_SIZE
 	default 512
 
 config VBOOT
-	select VBOOT_LID_SWITCH
+	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
+	select GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK
+	select GBB_FLAG_DISABLE_FWMP
+	select GBB_FLAG_DISABLE_LID_SHUTDOWN
+	select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
+	select GBB_FLAG_ENABLE_ALTERNATE_OS
+	select GBB_FLAG_FORCE_DEV_SWITCH_ON
+	select VBOOT_ALWAYS_ALLOW_UDC
+	select VBOOT_ALWAYS_ENABLE_DISPLAY
 	select VBOOT_MOCK_SECDATA if !MAINBOARD_HAS_TPM2
+	select VBOOT_NO_BOARD_SUPPORT
 
 config UART_FOR_CONSOLE
 	int