diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
index 3d2563df6921..a2a6f49ec557 100755
--- a/scripts/xtensa-build-zephyr.py
+++ b/scripts/xtensa-build-zephyr.py
@@ -82,7 +82,6 @@ class PlatformConfig:
 	XTENSA_CORE: str
 	DEFAULT_TOOLCHAIN_VARIANT: str = "xt-clang"
 	RIMAGE_KEY: pathlib.Path = pathlib.Path(SOF_TOP, "keys", "otc_private_key_3k.pem")
-	IPC4_RIMAGE_DESC: str = None
 	IPC4_CONFIG_OVERLAY: str = "ipc4_overlay.conf"
 	aliases: list = dataclasses.field(default_factory=list)
 
@@ -94,7 +93,6 @@ class PlatformConfig:
 		f"RG-2017.8{xtensa_tools_version_postfix}",
 		"cavs2x_LX6HiFi3_2017_8",
 		"xcc",
-		IPC4_RIMAGE_DESC = "tgl-cavs.toml",
 		aliases = ['adl', 'ehl']
 	),
 	"tgl-h" : PlatformConfig(
@@ -102,7 +100,6 @@ class PlatformConfig:
 		f"RG-2017.8{xtensa_tools_version_postfix}",
 		"cavs2x_LX6HiFi3_2017_8",
 		"xcc",
-		IPC4_RIMAGE_DESC = "tgl-h-cavs.toml",
 		aliases = ['adl-s']
 	),
 	"mtl" : PlatformConfig(
@@ -628,10 +625,7 @@ def rimage_options(platform_dict):
 	#                         test_00_01_load_fw_and_check_version
 	opts.append(("-b", "1"))
 
-	if platform_dict.get("IPC4_RIMAGE_DESC", None) is not None:
-		rimage_desc = platform_dict["IPC4_RIMAGE_DESC"]
-	else:
-		rimage_desc = platform_dict["name"] + ".toml"
+	rimage_desc = platform_dict["name"] + ".toml"
 
 	opts.append(("-c", str(RIMAGE_SOURCE_DIR / "config" / rimage_desc)))
 
diff --git a/tools/rimage/config/tgl-h-cavs.toml b/tools/rimage/config/tgl-h.toml
similarity index 100%
rename from tools/rimage/config/tgl-h-cavs.toml
rename to tools/rimage/config/tgl-h.toml
diff --git a/tools/rimage/config/tgl-cavs.toml b/tools/rimage/config/tgl.toml
similarity index 100%
rename from tools/rimage/config/tgl-cavs.toml
rename to tools/rimage/config/tgl.toml