diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 9ae9e4c8e5..f5aed08225 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -19,6 +19,7 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select INTEL_GMA_HAVE_VBT if !BOARD_GOOGLE_OCTOPUS
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_TPM2
@@ -31,24 +32,20 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
 
 config BOARD_GOOGLE_AMPTON
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_BLOOG
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_BOBBA
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_CASTA
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_DOOD
@@ -57,7 +54,6 @@ config BOARD_GOOGLE_DOOD
 
 config BOARD_GOOGLE_FLEEX
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
@@ -67,18 +63,15 @@ config BOARD_GOOGLE_FOOB
 
 config BOARD_GOOGLE_GARG
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_LICK
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_MEEP
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
@@ -87,13 +80,11 @@ config BOARD_GOOGLE_OCTOPUS
 
 config BOARD_GOOGLE_PHASER
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_YORP
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
 	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 
 if BOARD_GOOGLE_BASEBOARD_OCTOPUS
diff --git a/src/mainboard/google/octopus/variants/dood/data.vbt b/src/mainboard/google/octopus/variants/dood/data.vbt
new file mode 100644
index 0000000000..2848abe033
Binary files /dev/null and b/src/mainboard/google/octopus/variants/dood/data.vbt differ
diff --git a/src/mainboard/google/octopus/variants/foob/data.vbt b/src/mainboard/google/octopus/variants/foob/data.vbt
new file mode 100644
index 0000000000..fbcf46e849
Binary files /dev/null and b/src/mainboard/google/octopus/variants/foob/data.vbt differ