diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
index 959a1a49dfc6..a3a4a3b94351 100755
--- a/scripts/xtensa-build-zephyr.py
+++ b/scripts/xtensa-build-zephyr.py
@@ -76,25 +76,29 @@
 		"name": "apl",
 		"PLAT_CONFIG": "intel_adsp_cavs15",
 		"XTENSA_CORE": "X4H3I16w2D48w3a_2017_8",
-		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}"
+		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
+		"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
 	},
 	{
 		"name": "cnl",
 		"PLAT_CONFIG": "intel_adsp_cavs18",
 		"XTENSA_CORE": "X6H3CNL_2017_8",
-		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}"
+		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
+		"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
 	},
 	{
 		"name": "icl",
 		"PLAT_CONFIG": "intel_adsp_cavs20",
 		"XTENSA_CORE": "X6H3CNL_2017_8",
-		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}"
+		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
+		"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
 	},
 	{
 		"name": "jsl",
 		"PLAT_CONFIG": "intel_adsp_cavs20_jsl",
 		"XTENSA_CORE": "X6H3CNL_2017_8",
-		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}"
+		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
+		"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
 	},
 	{
 		"name": "tgl",
@@ -103,6 +107,7 @@
 		"IPC4_RIMAGE_DESC": "tgl-cavs.toml",
 		"XTENSA_CORE": "cavs2x_LX6HiFi3_2017_8",
 		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
+		"DEFAULT_TOOLCHAIN_VARIANT": "xcc",
 		"RIMAGE_KEY": pathlib.Path(SOF_TOP, "keys", "otc_private_key_3k.pem")
 	},
 	{
@@ -112,13 +117,15 @@
 		"IPC4_RIMAGE_DESC": "tgl-h-cavs.toml",
 		"XTENSA_CORE": "cavs2x_LX6HiFi3_2017_8",
 		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
+		"DEFAULT_TOOLCHAIN_VARIANT": "xcc",
 		"RIMAGE_KEY": pathlib.Path(SOF_TOP, "keys", "otc_private_key_3k.pem")
 	},
 	{
 		"name": "mtl",
 		"PLAT_CONFIG": "intel_adsp_ace15_mtpm",
-		"XTENSA_CORE": "ace10_LX7HiFi4_RI_2020_5",
-		"XTENSA_TOOLS_VERSION": f"RI-2020.5{xtensa_tools_version_postfix}",
+		"XTENSA_CORE": "ace10_LX7HiFi4_2022_10",
+		"XTENSA_TOOLS_VERSION": f"RI-2022.10{xtensa_tools_version_postfix}",
+		"DEFAULT_TOOLCHAIN_VARIANT": "xt-clang",
 		"RIMAGE_KEY": pathlib.Path(SOF_TOP, "keys", "otc_private_key_3k.pem")
 	},
 	# NXP platforms
@@ -542,7 +549,8 @@ def build_platforms():
 					"or is not a directory")
 
 			# set variables expected by zephyr/cmake/toolchain/xcc/generic.cmake
-			os.environ["ZEPHYR_TOOLCHAIN_VARIANT"] = "xcc"
+			os.environ["ZEPHYR_TOOLCHAIN_VARIANT"] = os.environ.get("ZEPHYR_TOOLCHAIN_VARIANT",
+				platform_dict["DEFAULT_TOOLCHAIN_VARIANT"])
 			XTENSA_TOOLCHAIN_PATH = str(pathlib.Path(xtensa_tools_root_dir, "install",
 				"tools").absolute())
 			os.environ["XTENSA_TOOLCHAIN_PATH"] = XTENSA_TOOLCHAIN_PATH
diff --git a/west.yml b/west.yml
index f43c3690da4d..4ced65820b7d 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 9af2789cad17924298d705b99a1bca5f35ea88e2
+      revision: e3ae110a05d3427647a03fcbeff4478c195c5a48
       remote: zephyrproject
       # Import some projects listed in zephyr/west.yml@revision
       #
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 1cb6308bd1d1..20af32be6a40 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -101,6 +101,10 @@ endif()
 
 # SOF module init
 zephyr_library_named(modules_sof)
+
+# Zephyr C++ code requires 14 or newer standard
+set_property(TARGET modules_sof PROPERTY CXX_STANDARD 17)
+
 zephyr_include_directories(
 	include
 )