diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
index 32e1752f55ec..612413ec1869 100755
--- a/scripts/xtensa-build-zephyr.py
+++ b/scripts/xtensa-build-zephyr.py
@@ -161,7 +161,7 @@ def parse_args():
 	parser.add_argument("platforms", nargs="*", action=validate_platforms_arguments,
 						help="List of platforms to build")
 	parser.add_argument("-d", "--debug", required=False, action="store_true",
-						help="Enable debug build")
+						help="Shortcut for: -o sof/app/debug_overlay.conf")
 	parser.add_argument("-i", "--ipc", required=False, choices=["IPC4"],
 			    help="""Applies --overlay <platform>/ipc4_overlay.conf
 and a different rimage config. Valid only for IPC3 platforms supporting IPC4 too.""")
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 82ccb02020d1..8e8ec41bde37 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -46,7 +46,8 @@ endfunction()
 zephyr_interface_library_named(SOF)
 
 # SOF source paths.
-set(SOF_SRC_PATH "../src")
+cmake_path(SET sof_top_dir NORMALIZE "${CMAKE_CURRENT_SOURCE_DIR}/..")
+set(SOF_SRC_PATH "${sof_top_dir}/src")
 set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/platform")
 set(SOF_AUDIO_PATH "${SOF_SRC_PATH}/audio")
 set(SOF_AUDIO_MODULES_PATH "${SOF_SRC_PATH}/audio/module_adapter/module")
@@ -86,18 +87,18 @@ ExternalProject_Add(sof_logger_ep
 )
 
 # default SOF includes
-target_include_directories(SOF INTERFACE ../rimage/src/include)
+target_include_directories(SOF INTERFACE ${sof_top_dir}/rimage/src/include)
 target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/include)
 target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/arch/${ARCH}/include)
-target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../third_party/include)
+target_include_directories(SOF INTERFACE ${sof_top_dir}/third_party/include)
 
 # TODO: Zephyr should not need xtos headers: FIX.
 if (CONFIG_SOF_ZEPHYR_STRICT_HEADERS)
-	target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../zephyr/include)
+	target_include_directories(SOF INTERFACE ${sof_top_dir}/zephyr/include)
 else()
 	# include Zephyr before xtos to flag up any errors in SOF
-	target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../zephyr/include)
-	target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../xtos/include)
+	target_include_directories(SOF INTERFACE ${sof_top_dir}/zephyr/include)
+	target_include_directories(SOF INTERFACE ${sof_top_dir}/xtos/include)
 endif()
 
 # SOF module init
@@ -705,7 +706,7 @@ zephyr_library_link_libraries(SOF)
 target_link_libraries(SOF INTERFACE zephyr_interface)
 
 # Setup SOF directories
-set(SOF_ROOT_SOURCE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..)
+set(SOF_ROOT_SOURCE_DIRECTORY ${sof_top_dir})
 set(SOF_ROOT_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 # This generated/ directory is shared with Zephyr.