diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 04b2bb0f30..641ece1253 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -76,4 +76,8 @@ config VARIANT_DIR
 	default "ripto" if BOARD_GOOGLE_RIPTO
 	default "volteer" if BOARD_GOOGLE_VOLTEER
 
+config VARIANT_HAS_MIPI_CAMERA
+	bool
+	default n
+
 endif # BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index 62aabb1858..f7d0909583 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -11,7 +11,9 @@ config BOARD_GOOGLE_MALEFOR
 config BOARD_GOOGLE_RIPTO
 	bool "-> Ripto"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select VARIANT_HAS_MIPI_CAMERA
 
 config BOARD_GOOGLE_VOLTEER
 	bool "-> Volteer"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select VARIANT_HAS_MIPI_CAMERA
diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl
index 640f7cd7fe..af881ae859 100644
--- a/src/mainboard/google/volteer/dsdt.asl
+++ b/src/mainboard/google/volteer/dsdt.asl
@@ -47,7 +47,10 @@ DefinitionBlock(
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
+
+#if CONFIG(VARIANT_HAS_MIPI_CAMERA)
 	/* Camera */
 	#include <soc/intel/tigerlake/acpi/ipu.asl>
-	#include "acpi/mipi_camera.asl"
+	#include <variant/acpi/mipi_camera.asl>
+#endif /* VARIANT_HAS_MIPI_CAMERA */
 }
diff --git a/src/mainboard/google/volteer/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
similarity index 100%
rename from src/mainboard/google/volteer/acpi/mipi_camera.asl
rename to src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
diff --git a/src/mainboard/google/volteer/variants/ripto/include/variant/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/ripto/include/variant/acpi/mipi_camera.asl
new file mode 100644
index 0000000000..6df508198f
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/ripto/include/variant/acpi/mipi_camera.asl
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
+
+#include <baseboard/acpi/mipi_camera.asl>
diff --git a/src/mainboard/google/volteer/variants/volteer/include/variant/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/volteer/include/variant/acpi/mipi_camera.asl
new file mode 100644
index 0000000000..6df508198f
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/volteer/include/variant/acpi/mipi_camera.asl
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
+
+#include <baseboard/acpi/mipi_camera.asl>