diff --git a/src/mainboard/system76/rpl/Kconfig b/src/mainboard/system76/rpl/Kconfig
index 10d215dc21..9425100713 100644
--- a/src/mainboard/system76/rpl/Kconfig
+++ b/src/mainboard/system76/rpl/Kconfig
@@ -79,10 +79,6 @@ config CBFS_SIZE
 config CONSOLE_POST
 	default y
 
-config MAX_CPUS
-	int
-	default 32
-
 config DIMM_SPD_SIZE
 	default 512
 
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
index a200121509..d1671e7c66 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
@@ -156,7 +156,7 @@ config ALDERLAKE_CAR_ENHANCED_NEM
 
 config MAX_CPUS
 	int
-	default 24
+	default 32
 
 config DCACHE_RAM_BASE
 	default 0xfef00000