diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf
index af5e05b699d0..7d6271905d9b 100644
--- a/app/boards/intel_adsp_ace20_lnl.conf
+++ b/app/boards/intel_adsp_ace20_lnl.conf
@@ -1,52 +1,18 @@
 CONFIG_LUNARLAKE=y
+CONFIG_RIMAGE_SIGNING_SCHEMA="lnl"
+
+# SOF / IPC configuration
 CONFIG_IPC_MAJOR_4=y
 CONFIG_IPC4_BASE_FW_INTEL=y
 
-CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
+# SOF / audio pipeline and module settings
+CONFIG_COMP_ARIA=y
+CONFIG_COMP_CHAIN_DMA=y
 CONFIG_COMP_DRC=m
-
-# power settings
-CONFIG_PM=y
-CONFIG_PM_DEVICE=y
-CONFIG_PM_DEVICE_RUNTIME=y
-CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
-CONFIG_PM_DEVICE_POWER_DOMAIN=y
-CONFIG_PM_POLICY_CUSTOM=y
-CONFIG_ADSP_IMR_CONTEXT_SAVE=y
-CONFIG_ADSP_IDLE_CLOCK_GATING=y
-
-CONFIG_POWER_DOMAIN=y
-CONFIG_POWER_DOMAIN_INTEL_ADSP=y
-
-# enable Zephyr drivers
-CONFIG_ZEPHYR_NATIVE_DRIVERS=y
-CONFIG_DAI=y
-CONFIG_DAI_INIT_PRIORITY=70
-CONFIG_DAI_INTEL_DMIC=y
-CONFIG_DAI_DMIC_HW_IOCLK=38400000
-CONFIG_DAI_INTEL_DMIC_NHLT=y
-CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
-CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
-CONFIG_DAI_INTEL_SSP=y
-CONFIG_PIPELINE_2_0=y
-CONFIG_ZEPHYR_DP_SCHEDULER=y
-CONFIG_DMA=y
-CONFIG_DMA_INTEL_ADSP_GPDMA=n
-CONFIG_INTEL_MODULES=y
-CONFIG_LIBRARY_MANAGER=y
-CONFIG_LIBRARY_AUTH_SUPPORT=y
-CONFIG_INTEL_ADSP_TIMER=y
-CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
-CONFIG_AMS=y
-CONFIG_COUNTER=y
-CONFIG_SOF_TELEMETRY=y
-CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
-CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
-
-CONFIG_HEAP_MEM_POOL_SIZE=8192
-CONFIG_L3_HEAP=y
-CONFIG_RIMAGE_SIGNING_SCHEMA="lnl"
-
+CONFIG_COMP_KPB=y
+CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
+CONFIG_COMP_UP_DOWN_MIXER=y
+CONFIG_COMP_VOLUME_WINDOWS_FADE=y
 CONFIG_FORMAT_CONVERT_HIFI3=n
 CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
 CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
@@ -54,43 +20,79 @@ CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
 CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y
 CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
 CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
-CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
-CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
-CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
-CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
-CONFIG_COMP_VOLUME_WINDOWS_FADE=y
-CONFIG_COMP_UP_DOWN_MIXER=y
-CONFIG_COMP_CHAIN_DMA=y
+CONFIG_PIPELINE_2_0=y
 CONFIG_SAMPLE_KEYPHRASE=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=38400000
-
-CONFIG_LOG_BACKEND_ADSP_MTRACE=y
-CONFIG_SOF_LOG_LEVEL_INF=y
-CONFIG_ZEPHYR_LOG=y
-CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y
-CONFIG_LOG_BACKEND_ADSP=n
-CONFIG_WINSTREAM_CONSOLE=n
-
-CONFIG_INTEL_ADSP_IPC=y
 
+# SOF / infrastructure
+CONFIG_AMS=y
+CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=y
+CONFIG_L3_HEAP=y
 CONFIG_PROBE=y
 CONFIG_PROBE_DMA_MAX=2
+CONFIG_SOF_TELEMETRY=y
+CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
+CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
+CONFIG_ZEPHYR_DP_SCHEDULER=y
+CONFIG_ZEPHYR_NATIVE_DRIVERS=y
 
-CONFIG_MEMORY_WIN_2_SIZE=12288
+# SOF / loadable modules
+CONFIG_INTEL_MODULES=y
+CONFIG_LIBRARY_AUTH_SUPPORT=y
+CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
+CONFIG_LIBRARY_MANAGER=y
 
+# SOF / logging
+CONFIG_SOF_LOG_LEVEL_INF=y
+CONFIG_TRACE=n
+
+# Zephyr / OS features
+CONFIG_COUNTER=y
+CONFIG_HEAP_MEM_POOL_SIZE=8192
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_MODULES=y
-CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
-
 CONFIG_TIMING_FUNCTIONS=y
-CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=y
 
-# Temporary disabled options
-CONFIG_TRACE=n
-CONFIG_COMP_KPB=y
-CONFIG_COMP_ARIA=y
-CONFIG_CLOCK_CONTROL_ADSP=y
+# Zephyr / device drivers
 CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_ADSP=y
+CONFIG_DAI=y
+CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
+CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
+CONFIG_DAI_DMIC_HW_IOCLK=38400000
+CONFIG_DAI_INIT_PRIORITY=70
+CONFIG_DAI_INTEL_DMIC=y
+CONFIG_DAI_INTEL_DMIC_NHLT=y
+CONFIG_DAI_INTEL_SSP=y
+CONFIG_DMA=y
+CONFIG_DMA_INTEL_ADSP_GPDMA=n
+CONFIG_INTEL_ADSP_IPC=y
+CONFIG_INTEL_ADSP_TIMER=y
+CONFIG_MEMORY_WIN_2_SIZE=12288
+CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=38400000
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
+
+# Zephyr / power settings
+CONFIG_ADSP_IDLE_CLOCK_GATING=y
+CONFIG_ADSP_IMR_CONTEXT_SAVE=y
+CONFIG_PM=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
+CONFIG_PM_DEVICE_RUNTIME=y
+CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
+CONFIG_PM_POLICY_CUSTOM=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_POWER_DOMAIN_INTEL_ADSP=y
+
+# Zephyr / logging
+CONFIG_LOG_BACKEND_ADSP=n
+CONFIG_LOG_BACKEND_ADSP_MTRACE=y
+CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
+CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
+CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
+CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
+CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y
 CONFIG_LOG_TIMESTAMP_64BIT=y
+CONFIG_WINSTREAM_CONSOLE=n
+CONFIG_ZEPHYR_LOG=y