diff --git a/app/prj.conf b/app/prj.conf
index e072f1df2fd2..b0d1bdaa29e3 100644
--- a/app/prj.conf
+++ b/app/prj.conf
@@ -1,4 +1,3 @@
-CONFIG_SOF=y
 CONFIG_BUILD_OUTPUT_BIN=n
 
 # The additional stripped .elf files are deterministic.
diff --git a/src/arch/host/Kconfig b/src/arch/host/Kconfig
index de92f43a868c..5ef3f7420a25 100644
--- a/src/arch/host/Kconfig
+++ b/src/arch/host/Kconfig
@@ -4,6 +4,6 @@
 
 config CORE_COUNT
 	int
-	default 1
+	default MP_MAX_NUM_CPUS
 	help
 	  Number of used cores
diff --git a/west.yml b/west.yml
index 830d667ce37c..c1ec6804ca9f 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: e876dee6f2e78788e983385de231eab50e1db543
+      revision: pull/97946/head
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 3e0207b17a0d..79c305971d17 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -2,8 +2,6 @@
 # compile every Zephyr module that can be found. See
 # sof/zephyr/module.yml and
 # https://docs.zephyrproject.org/latest/develop/modules.html
-if(CONFIG_SOF)
-
 if(CONFIG_ZEPHYR_POSIX)
 	set(ARCH host)
 	set(PLATFORM "posix")
@@ -554,5 +552,3 @@ include(../scripts/cmake/uuid-registry.cmake)
 
 # Create Trace realtive file paths
 sof_append_relative_path_definitions(modules_sof)
-
-endif() # CONFIG_SOF
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index 1314454a0466..a8f9200ebca2 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -1,5 +1,3 @@
-if SOF
-
 config SOF_STAGING
 	bool "Enable SOF staging features and modules"
 	help
@@ -166,5 +164,3 @@ config STACK_SIZE_IPC_TX
 	default 2048
 	help
 	  IPC sender work-queue thread stack size. Keep a power of 2.
-
-endif