diff --git a/boards/x86/intel_adl/Kconfig.defconfig b/boards/x86/intel_adl/Kconfig.defconfig
index 39ef7ac9a9a..0bc114e4693 100644
--- a/boards/x86/intel_adl/Kconfig.defconfig
+++ b/boards/x86/intel_adl/Kconfig.defconfig
@@ -31,6 +31,18 @@ endif
 config ACPI
 	default y
 
+if ACPI
+config HEAP_MEM_POOL_SIZE
+	default 64000000
+config MAIN_STACK_SIZE
+	default 320000
+
+if SHELL
+config SHELL_STACK_SIZE
+	default 320000
+endif # SHELL
+endif # ACPI
+
 endif # BOARD_INTEL_ADL_CRB || BOARD_INTEL_ADL_RVP
 
 if BOARD_INTEL_ADL_RVP
diff --git a/boards/x86/intel_adl/intel_adl_crb_defconfig b/boards/x86/intel_adl/intel_adl_crb_defconfig
index 767f5e5e84b..c2c1a37850d 100644
--- a/boards/x86/intel_adl/intel_adl_crb_defconfig
+++ b/boards/x86/intel_adl/intel_adl_crb_defconfig
@@ -12,6 +12,4 @@ CONFIG_X2APIC=y
 CONFIG_SMP=y
 CONFIG_BUILD_OUTPUT_EFI=y
 CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_HEAP_MEM_POOL_SIZE=64000000
-CONFIG_MAIN_STACK_SIZE=320000
 CONFIG_UART_NS16550_PARENT_INIT_LEVEL=y
diff --git a/boards/x86/intel_adl/intel_adl_rvp_defconfig b/boards/x86/intel_adl/intel_adl_rvp_defconfig
index 490b390f356..41260a3b233 100644
--- a/boards/x86/intel_adl/intel_adl_rvp_defconfig
+++ b/boards/x86/intel_adl/intel_adl_rvp_defconfig
@@ -12,6 +12,4 @@ CONFIG_X2APIC=y
 CONFIG_SMP=y
 CONFIG_BUILD_OUTPUT_EFI=y
 CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_HEAP_MEM_POOL_SIZE=64000000
-CONFIG_MAIN_STACK_SIZE=320000
 CONFIG_UART_NS16550_PARENT_INIT_LEVEL=y