diff --git a/src/mainboard/google/puff/Kconfig b/src/mainboard/google/puff/Kconfig
index c35cf6b188..2ec9d996b9 100644
--- a/src/mainboard/google/puff/Kconfig
+++ b/src/mainboard/google/puff/Kconfig
@@ -24,6 +24,7 @@ config BOARD_GOOGLE_BASEBOARD_PUFF
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_TPM2
@@ -41,50 +42,40 @@ config BOARD_GOOGLE_BASEBOARD_PUFF
 
 config BOARD_GOOGLE_AMBASSADOR
 	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_DOOLY
 	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 	select SYSTEM_TYPE_ALL_IN_ONE
 
 config BOARD_GOOGLE_DUFFY_LEGACY
 	select BOARD_GOOGLE_BASEBOARD_PUFF
 	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_DUFFY
 	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_FAFFY
 	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_GENESIS
 	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_KAISA_LEGACY
 	select BOARD_GOOGLE_BASEBOARD_PUFF
 	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_KAISA
 	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_MOONBUGGY
 	select BOARD_GOOGLE_BASEBOARD_PUFF
 
 config BOARD_GOOGLE_NOIBAT
 	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_PUFF
 	select BOARD_GOOGLE_BASEBOARD_PUFF
 	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_SCOUT
 	select BOARD_GOOGLE_BASEBOARD_PUFF
@@ -92,7 +83,6 @@ config BOARD_GOOGLE_SCOUT
 
 config BOARD_GOOGLE_WYVERN
 	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 if BOARD_GOOGLE_BASEBOARD_PUFF
 
diff --git a/src/mainboard/google/puff/variants/moonbuggy/data.vbt b/src/mainboard/google/puff/variants/moonbuggy/data.vbt
new file mode 100644
index 0000000000..a25cfde012
Binary files /dev/null and b/src/mainboard/google/puff/variants/moonbuggy/data.vbt differ
diff --git a/src/mainboard/google/puff/variants/scout/data.vbt b/src/mainboard/google/puff/variants/scout/data.vbt
new file mode 100644
index 0000000000..ca387a5a70
Binary files /dev/null and b/src/mainboard/google/puff/variants/scout/data.vbt differ