diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf
deleted file mode 100644
index f23a6244c..000000000
--- a/app/boards/intel_adsp_ace15_mtpm.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_INTEL_DMIC=y
-CONFIG_INTEL_SSP=y
-CONFIG_INTEL_ALH=y
-CONFIG_LP_MEMORY_BANKS=1
-CONFIG_RIMAGE_SIGNING_SCHEMA="mtl"
-CONFIG_IPC_MAJOR_4=y
-CONFIG_COMP_SRC=n
-CONFIG_INTEL_ADSP_TIMER=n
-CONFIG_FORMAT_CONVERT_HIFI3=n
diff --git a/overlays/common/debug_overlay.conf b/app/debug_overlay.conf
similarity index 100%
rename from overlays/common/debug_overlay.conf
rename to app/debug_overlay.conf
diff --git a/overlays/tgl-h/ipc4_overlay.conf b/app/overlays/tgl-h/ipc4_overlay.conf
similarity index 100%
rename from overlays/tgl-h/ipc4_overlay.conf
rename to app/overlays/tgl-h/ipc4_overlay.conf
diff --git a/overlays/tgl/ipc4_overlay.conf b/app/overlays/tgl/ipc4_overlay.conf
similarity index 100%
rename from overlays/tgl/ipc4_overlay.conf
rename to app/overlays/tgl/ipc4_overlay.conf
diff --git a/overlays/apl/overlay.conf b/overlays/apl/overlay.conf
deleted file mode 100644
index 0e0b12547..000000000
--- a/overlays/apl/overlay.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_APOLLOLAKE=y
-CONFIG_INTEL_DMIC=y
-CONFIG_INTEL_SSP=y
-CONFIG_LP_MEMORY_BANKS=2
-CONFIG_HP_MEMORY_BANKS=8
-CONFIG_PERFORMANCE_COUNTERS=y
-CONFIG_COMP_SRC_TINY=y
diff --git a/overlays/cnl/overlay.conf b/overlays/cnl/overlay.conf
deleted file mode 100644
index a49f550c3..000000000
--- a/overlays/cnl/overlay.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_CANNONLAKE=y
-CONFIG_INTEL_DMIC=y
-CONFIG_INTEL_SSP=y
-CONFIG_INTEL_ALH=y
-CONFIG_LP_MEMORY_BANKS=1
-CONFIG_HP_MEMORY_BANKS=47
-CONFIG_PERFORMANCE_COUNTERS=y
diff --git a/overlays/icl/overlay.conf b/overlays/icl/overlay.conf
deleted file mode 100644
index 0f3a659cb..000000000
--- a/overlays/icl/overlay.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_ICELAKE=y
-CONFIG_INTEL_DMIC=y
-CONFIG_INTEL_SSP=y
-CONFIG_INTEL_ALH=y
-CONFIG_LP_MEMORY_BANKS=1
-CONFIG_HP_MEMORY_BANKS=47
diff --git a/overlays/imx8/overlay.conf b/overlays/imx8/overlay.conf
deleted file mode 100644
index a245738a5..000000000
--- a/overlays/imx8/overlay.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_IMX8=y
-CONFIG_HAVE_AGENT=n
-CONFIG_FORMAT_CONVERT_HIFI3=n
-CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n
diff --git a/overlays/imx8m/overlay.conf b/overlays/imx8m/overlay.conf
deleted file mode 100644
index bb9d86024..000000000
--- a/overlays/imx8m/overlay.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_IMX8M=y
-CONFIG_HAVE_AGENT=n
-CONFIG_FORMAT_CONVERT_HIFI3=n
-CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n
diff --git a/overlays/imx8x/overlay.conf b/overlays/imx8x/overlay.conf
deleted file mode 100644
index a7766c19b..000000000
--- a/overlays/imx8x/overlay.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_IMX8X=y
-CONFIG_HAVE_AGENT=n
-CONFIG_FORMAT_CONVERT_HIFI3=n
-CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n
diff --git a/overlays/jsl/overlay.conf b/overlays/jsl/overlay.conf
deleted file mode 100644
index 46579f49d..000000000
--- a/overlays/jsl/overlay.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_ICELAKE=y
-CONFIG_INTEL_DMIC=y
-CONFIG_INTEL_SSP=y
-CONFIG_LP_MEMORY_BANKS=1
-CONFIG_HP_MEMORY_BANKS=16
diff --git a/overlays/tgl-h/overlay.conf b/overlays/tgl-h/overlay.conf
deleted file mode 100644
index 7ec23d237..000000000
--- a/overlays/tgl-h/overlay.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_TIGERLAKE=y
-CONFIG_INTEL_DMIC=y
-CONFIG_INTEL_SSP=y
-CONFIG_INTEL_ALH=y
-CONFIG_LP_MEMORY_BANKS=1
-CONFIG_HP_MEMORY_BANKS=30
-CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-h"
diff --git a/overlays/tgl/overlay.conf b/overlays/tgl/overlay.conf
deleted file mode 100644
index cf017a4bc..000000000
--- a/overlays/tgl/overlay.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_TIGERLAKE=y
-CONFIG_INTEL_DMIC=y
-CONFIG_INTEL_SSP=y
-CONFIG_INTEL_ALH=y
-CONFIG_LP_MEMORY_BANKS=1
-CONFIG_HP_MEMORY_BANKS=30
-CONFIG_RIMAGE_SIGNING_SCHEMA="tgl"
diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
index aa62b2c14..077b84500 100755
--- a/scripts/xtensa-build-zephyr.py
+++ b/scripts/xtensa-build-zephyr.py
@@ -483,7 +483,7 @@ def build_platforms():
 		build_cmd = ["west"]
 		build_cmd += ["-v"] * args.verbose
 		build_cmd += ["build", "--build-dir", platform_build_dir_name]
-		source_dir = pathlib.Path(west_top, "zephyr", "samples", "subsys", "audio", "sof")
+		source_dir = pathlib.Path(SOF_TOP, "app")
 		build_cmd += ["--board", PLAT_CONFIG, str(source_dir)]
 
 		build_cmd.append('--')
@@ -491,23 +491,20 @@ def build_platforms():
 			build_cmd += args.cmake_args
 
 		overlays = [str(item.resolve(True)) for item in args.overlay]
-		# You may override default overlay.conf file name using CONFIG_OVERLAY in your platform
-		# dictionary
-		overlay_filename = platform_dict.get("CONFIG_OVERLAY", "overlay.conf")
-		overlays.append(str(pathlib.Path(SOF_TOP, "overlays", platform, overlay_filename)))
-
 		# The '-d' option is a shortcut for '-o path_to_debug_overlay', we are good
 		# if both are provided, because it's no harm to merge the same overlay twice.
 		if args.debug:
-			overlays.append(str(pathlib.Path(SOF_TOP, "overlays", "common", "debug_overlay.conf")))
+			overlays.append(str(pathlib.Path(SOF_TOP, "app", "debug_overlay.conf")))
 
 		# The '-i IPC4' is a shortcut for '-o path_to_ipc4_overlay', we are good if both
 		# are provided, because it's no harm to merge the same overlay twice.
 		if args.ipc == "IPC4":
-			overlays.append(str(pathlib.Path(SOF_TOP, "overlays", platform, platform_dict["IPC4_CONFIG_OVERLAY"])))
+			overlays.append(str(pathlib.Path(SOF_TOP, "app", "overlays", platform,
+                            platform_dict["IPC4_CONFIG_OVERLAY"])))
 
-		overlays = ";".join(overlays)
-		build_cmd.append(f"-DOVERLAY_CONFIG={overlays}")
+		if overlays:
+			overlays = ";".join(overlays)
+			build_cmd.append(f"-DOVERLAY_CONFIG={overlays}")
 
 		# Build
 		execute_command(build_cmd, cwd=west_top)