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/test/ztest/unit/fast-get/CMakeLists.txt b/test/ztest/unit/fast-get/CMakeLists.txt
index 45de96da341c..7bd45c84d013 100644
--- a/test/ztest/unit/fast-get/CMakeLists.txt
+++ b/test/ztest/unit/fast-get/CMakeLists.txt
@@ -16,7 +16,6 @@ target_include_directories(app PRIVATE
 
 # Define SOF-specific configurations for unit testing
 target_compile_definitions(app PRIVATE
-	-DCONFIG_SOF_LOG_LEVEL=CONFIG_LOG_DEFAULT_LEVEL
 	-DCONFIG_ZEPHYR_POSIX=1
 )
 
diff --git a/test/ztest/unit/fast-get/prj.conf b/test/ztest/unit/fast-get/prj.conf
index 9467c2926896..f530dfdd94f9 100644
--- a/test/ztest/unit/fast-get/prj.conf
+++ b/test/ztest/unit/fast-get/prj.conf
@@ -1 +1,2 @@
 CONFIG_ZTEST=y
+CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n
\ No newline at end of file
diff --git a/test/ztest/unit/list/prj.conf b/test/ztest/unit/list/prj.conf
index 9467c2926896..f530dfdd94f9 100644
--- a/test/ztest/unit/list/prj.conf
+++ b/test/ztest/unit/list/prj.conf
@@ -1 +1,2 @@
 CONFIG_ZTEST=y
+CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n
\ No newline at end of file
diff --git a/test/ztest/unit/math/basic/arithmetic/CMakeLists.txt b/test/ztest/unit/math/basic/arithmetic/CMakeLists.txt
index b6822ca7f2a2..8b280a0dfb49 100644
--- a/test/ztest/unit/math/basic/arithmetic/CMakeLists.txt
+++ b/test/ztest/unit/math/basic/arithmetic/CMakeLists.txt
@@ -12,7 +12,6 @@ target_include_directories(app PRIVATE
 
 # Define SOF-specific configurations for unit testing
 target_compile_definitions(app PRIVATE
-	-DCONFIG_SOF_LOG_LEVEL=CONFIG_LOG_DEFAULT_LEVEL
 	-DCONFIG_ZEPHYR_POSIX=1
 	-DCONFIG_LIBRARY=1
 	-DCONFIG_NUMBERS_VECTOR_FIND=1
diff --git a/test/ztest/unit/math/basic/arithmetic/prj.conf b/test/ztest/unit/math/basic/arithmetic/prj.conf
index 9467c2926896..f530dfdd94f9 100644
--- a/test/ztest/unit/math/basic/arithmetic/prj.conf
+++ b/test/ztest/unit/math/basic/arithmetic/prj.conf
@@ -1 +1,2 @@
 CONFIG_ZTEST=y
+CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n
\ No newline at end of file
diff --git a/test/ztest/unit/math/basic/trigonometry/CMakeLists.txt b/test/ztest/unit/math/basic/trigonometry/CMakeLists.txt
index b5387a998aee..90b636fa940c 100644
--- a/test/ztest/unit/math/basic/trigonometry/CMakeLists.txt
+++ b/test/ztest/unit/math/basic/trigonometry/CMakeLists.txt
@@ -12,7 +12,6 @@ target_include_directories(app PRIVATE
 
 # Define SOF-specific configurations for unit testing
 target_compile_definitions(app PRIVATE
-	-DCONFIG_SOF_LOG_LEVEL=CONFIG_LOG_DEFAULT_LEVEL
 	-DCONFIG_ZEPHYR_POSIX=1
 	-DCONFIG_LIBRARY=1
 	-DUNIT_TEST=1
diff --git a/test/ztest/unit/math/basic/trigonometry/prj.conf b/test/ztest/unit/math/basic/trigonometry/prj.conf
index 9467c2926896..f530dfdd94f9 100644
--- a/test/ztest/unit/math/basic/trigonometry/prj.conf
+++ b/test/ztest/unit/math/basic/trigonometry/prj.conf
@@ -1 +1,2 @@
 CONFIG_ZTEST=y
+CONFIG_SOF_FULL_ZEPHYR_APPLICATION=n
\ No newline at end of file
diff --git a/west.yml b/west.yml
index aec1227bab8c..e3978203db80 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 3568e1b6d5cdd51a6b964a2a1d6d29200fea2056
+      revision: f3b9d1871104b0d69abf6182ef7d262652b13729
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 4ef481d8c52d..baac43ffe884 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -2,7 +2,7 @@
 # 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_SOF_FULL_ZEPHYR_APPLICATION)
 
 if(CONFIG_ZEPHYR_POSIX)
 	set(ARCH host)
@@ -567,4 +567,4 @@ include(../scripts/cmake/uuid-registry.cmake)
 # Create Trace realtive file paths
 sof_append_relative_path_definitions(modules_sof)
 
-endif() # CONFIG_SOF
+endif() # CONFIG_SOF_FULL_ZEPHYR_APPLICATION
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index 20a3b6f173a2..3f9fd344e8f3 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -1,4 +1,10 @@
-if SOF
+config SOF_FULL_ZEPHYR_APPLICATION
+	bool "Build full SOF Zephyr application"
+	default y
+	help
+	  Top-level build option to enable full build of the SOF application
+	  on top of Zephyr. This should be set to no only for unit test and
+	  such special build targets.
 
 config SOF_STAGING
 	bool "Enable SOF staging features and modules"
@@ -203,5 +209,3 @@ config STACK_SIZE_IPC_TX
 	default 2048
 	help
 	  IPC sender work-queue thread stack size. Keep a power of 2.
-
-endif