diff --git a/src/Kconfig b/src/Kconfig
index 1d71840308..e4c8467f21 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -652,18 +652,11 @@ endmenu
 # load site-local kconfig to allow user specific defaults and overrides
 source "site-local/Kconfig"
 
-config SYSTEM_TYPE_BOX
-	default n
-	bool
-	help
-	  For devices like chromebox, mac-mini etc. These devices
-	  without built-in display and operates on AC supply alone.
-
-config SYSTEM_TYPE_LAPTOP
+config SYSTEM_TYPE_ALL_IN_ONE
 	default n
 	bool
 
-config SYSTEM_TYPE_TABLET
+config SYSTEM_TYPE_CONVERTIBLE
 	default n
 	bool
 
@@ -671,7 +664,22 @@ config SYSTEM_TYPE_DETACHABLE
 	default n
 	bool
 
-config SYSTEM_TYPE_CONVERTIBLE
+config SYSTEM_TYPE_LAPTOP
+	default n
+	bool
+
+config SYSTEM_TYPE_MINIPC
+	default n
+	bool
+	help
+	  For devices like chromebox, mac-mini etc. These devices
+	  without built-in display and operates on AC supply alone.
+
+config SYSTEM_TYPE_SERVER
+	default n
+	bool
+
+config SYSTEM_TYPE_TABLET
 	default n
 	bool
 
diff --git a/src/lib/smbios_defaults.c b/src/lib/smbios_defaults.c
index 0ad6442a4f..ba6b231741 100644
--- a/src/lib/smbios_defaults.c
+++ b/src/lib/smbios_defaults.c
@@ -99,6 +99,12 @@ __weak smbios_enclosure_type smbios_mainboard_enclosure_type(void)
 		return SMBIOS_ENCLOSURE_CONVERTIBLE;
 	else if (CONFIG(SYSTEM_TYPE_DETACHABLE))
 		return SMBIOS_ENCLOSURE_DETACHABLE;
+	else if (CONFIG(SYSTEM_TYPE_SERVER))
+		return SMBIOS_ENCLOSURE_MAIN_SERVER_CHASSIS;
+	else if (CONFIG(SYSTEM_TYPE_MINIPC))
+		return SMBIOS_ENCLOSURE_MINI_PC;
+	else if (CONFIG(SYSTEM_TYPE_ALL_IN_ONE))
+		return SMBIOS_ENCLOSURE_ALL_IN_ONE;
 	else
 		return SMBIOS_ENCLOSURE_DESKTOP;
 }
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index fc18f8f660..31948fbdb7 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -97,7 +97,7 @@ config BOARD_GOOGLE_BASEBOARD_NISSA
 	select SOC_INTEL_ALDERLAKE_PCH_N
 	select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW
 	select SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE
-	select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_BOX
+	select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_MINIPC
 	select TPM_GOOGLE_TI50
 	select SOC_INTEL_COMMON_MMC_OVERRIDE
 
@@ -223,7 +223,7 @@ config BOARD_GOOGLE_CROTA
 config BOARD_GOOGLE_DIRKS
 	select BOARD_GOOGLE_BASEBOARD_NISSA
 	select SOC_INTEL_TWINLAKE
-	select SYSTEM_TYPE_BOX
+	select SYSTEM_TYPE_MINIPC
 
 config BOARD_GOOGLE_DOCHI
 	select BOARD_GOOGLE_BASEBOARD_BRYA