diff --git a/src/mainboard/clevo/adl-p/Kconfig b/src/mainboard/clevo/adl-p/Kconfig
index 28bf13c5a2..e6f3f96ce4 100644
--- a/src/mainboard/clevo/adl-p/Kconfig
+++ b/src/mainboard/clevo/adl-p/Kconfig
@@ -102,6 +102,7 @@ config VBOOT
 	select VBOOT_ALWAYS_ENABLE_DISPLAY
 	select VBOOT_NO_BOARD_SUPPORT
 	select HAS_RECOVERY_MRC_CACHE
+	select VBOOT_CLEAR_RECOVERY_EACH_BOOT
 
 config VBOOT_SLOTS_RW_A
 	default y if VBOOT
diff --git a/src/mainboard/clevo/adl-p/ramstage.c b/src/mainboard/clevo/adl-p/ramstage.c
index 988365885c..96d0282334 100644
--- a/src/mainboard/clevo/adl-p/ramstage.c
+++ b/src/mainboard/clevo/adl-p/ramstage.c
@@ -159,16 +159,9 @@ static void mainboard_enable(struct device *dev)
 #endif
 }
 
-static void mainboard_final(void *chip_info)
-{
-	if (CONFIG(VBOOT))
-		vboot_clear_recovery_request();
-}
-
 struct chip_operations mainboard_ops = {
 	.enable_dev = mainboard_enable,
 	.init = mainboard_init,
-	.final = mainboard_final,
 };
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *params)
diff --git a/src/mainboard/clevo/tgl-u/Kconfig b/src/mainboard/clevo/tgl-u/Kconfig
index 827d50f7a4..a9dbd15b45 100644
--- a/src/mainboard/clevo/tgl-u/Kconfig
+++ b/src/mainboard/clevo/tgl-u/Kconfig
@@ -106,6 +106,7 @@ config VBOOT
 	select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
 	select GBB_FLAG_DISABLE_FWMP
 	select HAS_RECOVERY_MRC_CACHE
+	select VBOOT_CLEAR_RECOVERY_EACH_BOOT
 
 config VBOOT_SLOTS_RW_A
 	default y if VBOOT
diff --git a/src/mainboard/clevo/tgl-u/ramstage.c b/src/mainboard/clevo/tgl-u/ramstage.c
index 1b64e0ca63..c5a521f7a5 100644
--- a/src/mainboard/clevo/tgl-u/ramstage.c
+++ b/src/mainboard/clevo/tgl-u/ramstage.c
@@ -160,12 +160,6 @@ static void mainboard_enable(struct device *dev)
 #endif
 }
 
-static void mainboard_final(void *chip_info)
-{
-	if (CONFIG(VBOOT))
-		vboot_clear_recovery_request();
-}
-
 void mainboard_update_soc_chip_config(struct soc_intel_tigerlake_config *config)
 {
 	if (get_sleep_type_option() == SLEEP_TYPE_OPTION_S3)
@@ -177,5 +171,4 @@ void mainboard_update_soc_chip_config(struct soc_intel_tigerlake_config *config)
 struct chip_operations mainboard_ops = {
 	.enable_dev = mainboard_enable,
 	.init = init_mainboard,
-	.final = mainboard_final,
 };