diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
index 4e29c359b0c4..25a469260dc0 100755
--- a/scripts/xtensa-build-zephyr.py
+++ b/scripts/xtensa-build-zephyr.py
@@ -1029,8 +1029,8 @@ class InstFile:
 	installed_files = [
 		# Fail if one of these is missing
 		InstFile(".config", "config", txt=True),
-		InstFile("include/generated/autoconf.h", "generated_autoconf.h", txt=True),
-		InstFile("include/generated/version.h", "zephyr_version.h",
+		InstFile("include/generated/zephyr/autoconf.h", "generated_autoconf.h", txt=True),
+		InstFile("include/generated/zephyr/version.h", "zephyr_version.h",
 			 gzip=False, txt=True),
 		InstFile("include/generated/sof_versions.h", "sof_versions.h",
 			 gzip=False, txt=True),
diff --git a/west.yml b/west.yml
index 2d2ae0640b4d..9a9f877027b0 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 69d790b293316ae3651f244f2452705ee65c1f4b
+      revision: 53ddff639562ef68dc0a6f62b82f7505c75ebdce
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index d230de902514..3958e767a0e4 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -76,7 +76,7 @@ function(sof_llext_build module)
 		PRE_BUILD
 		COMMAND ${CMAKE_C_COMPILER} -E ${CMAKE_CURRENT_LIST_DIR}/llext.toml.h -P -DREM=
 			-I${SOF_BASE} -I${SOF_BASE}src
-			-imacros ../include/generated/autoconf.h
+			-imacros ../include/generated/zephyr/autoconf.h
 			-o rimage_config.toml
 	)