diff --git a/src/mainboard/google/bluey/Kconfig b/src/mainboard/google/bluey/Kconfig
index a6ead70307..0f5e8c3950 100644
--- a/src/mainboard/google/bluey/Kconfig
+++ b/src/mainboard/google/bluey/Kconfig
@@ -2,8 +2,6 @@
 
 config BOARD_GOOGLE_BLUEY_COMMON
 	def_bool n
-	select ARM64_USE_SECURE_OS
-	select ARM64_USE_SECURE_OS_PAYLOAD
 	select COMMON_CBFS_SPI_WRAPPER
 	select MAINBOARD_HAS_CHROMEOS
 	select SPI_FLASH
diff --git a/src/soc/qualcomm/x1p42100/Kconfig b/src/soc/qualcomm/x1p42100/Kconfig
index c02c2a649b..7107720391 100644
--- a/src/soc/qualcomm/x1p42100/Kconfig
+++ b/src/soc/qualcomm/x1p42100/Kconfig
@@ -39,6 +39,8 @@ config SOC_QUALCOMM_X1P42100
 
 config SOC_QUALCOMM_HAMOA
 	bool
+	select ARM64_USE_SECURE_OS
+	select ARM64_USE_SECURE_OS_PAYLOAD
 	select SOC_QUALCOMM_BASE
 	default n
 	help