diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt
index f42b527a651f..cfe300b1aad8 100644
--- a/tools/topology/CMakeLists.txt
+++ b/tools/topology/CMakeLists.txt
@@ -117,10 +117,10 @@ set(TPLGS
 	"sof-tgl-nocodec\;sof-ehl-nocodec"
 	"sof-ehl-rt5660\;sof-ehl-rt5660\;-DHDMI=1"
 	"sof-ehl-rt5660\;sof-ehl-rt5660-nohdmi"
-	"sof-imx8qxp-nocodec\;sof-imx8qxp-nocodec"
-	"sof-imx8qxp-cs42888\;sof-imx8qxp-cs42888"
-	"sof-imx8qxp-nocodec-sai\;sof-imx8qxp-nocodec-sai"
-	"sof-imx8qxp-wm8960\;sof-imx8qxp-wm8960"
+	"sof-imx8-nocodec\;sof-imx8-nocodec"
+	"sof-imx8-cs42888\;sof-imx8-cs42888"
+	"sof-imx8-nocodec-sai\;sof-imx8-nocodec-sai"
+	"sof-imx8-wm8960\;sof-imx8-wm8960"
 	"sof-imx8-wm8960-mixer\;sof-imx8-wm8960-mixer"
 	"sof-imx8-cs42888-mixer\;sof-imx8-cs42888-mixer"
 	"sof-imx8mp-wm8960-mixer\;sof-imx8mp-wm8960-mixer"
diff --git a/tools/topology/development/sof-imx8-src-cs42888.m4 b/tools/topology/development/sof-imx8-src-cs42888.m4
index 13fac9adafb0..c22cdb6a6ad0 100644
--- a/tools/topology/development/sof-imx8-src-cs42888.m4
+++ b/tools/topology/development/sof-imx8-src-cs42888.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/development/sof-imx8-src-wm8960.m4 b/tools/topology/development/sof-imx8-src-wm8960.m4
index bf4323bdc56f..b9d17684f333 100644
--- a/tools/topology/development/sof-imx8-src-wm8960.m4
+++ b/tools/topology/development/sof-imx8-src-wm8960.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/development/sof-imx8mp-src-wm8960.m4 b/tools/topology/development/sof-imx8mp-src-wm8960.m4
index 7f97c6f0bd89..9ae070dec6cf 100644
--- a/tools/topology/development/sof-imx8mp-src-wm8960.m4
+++ b/tools/topology/development/sof-imx8mp-src-wm8960.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/platform/imx/imx8qxp.m4 b/tools/topology/platform/imx/imx8.m4
similarity index 100%
rename from tools/topology/platform/imx/imx8qxp.m4
rename to tools/topology/platform/imx/imx8.m4
diff --git a/tools/topology/sof-imx8-cs42888-mixer.m4 b/tools/topology/sof-imx8-cs42888-mixer.m4
index 432a619a3c5f..2f9d257a4923 100644
--- a/tools/topology/sof-imx8-cs42888-mixer.m4
+++ b/tools/topology/sof-imx8-cs42888-mixer.m4
@@ -15,7 +15,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8qxp-cs42888.m4 b/tools/topology/sof-imx8-cs42888.m4
similarity index 98%
rename from tools/topology/sof-imx8qxp-cs42888.m4
rename to tools/topology/sof-imx8-cs42888.m4
index d6c7071fe67d..770337f34f96 100644
--- a/tools/topology/sof-imx8qxp-cs42888.m4
+++ b/tools/topology/sof-imx8-cs42888.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8qxp-nocodec-sai.m4 b/tools/topology/sof-imx8-nocodec-sai.m4
similarity index 97%
rename from tools/topology/sof-imx8qxp-nocodec-sai.m4
rename to tools/topology/sof-imx8-nocodec-sai.m4
index 0bb539453158..e1337d80c8b2 100644
--- a/tools/topology/sof-imx8qxp-nocodec-sai.m4
+++ b/tools/topology/sof-imx8-nocodec-sai.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8qxp-nocodec.m4 b/tools/topology/sof-imx8-nocodec.m4
similarity index 97%
rename from tools/topology/sof-imx8qxp-nocodec.m4
rename to tools/topology/sof-imx8-nocodec.m4
index db979a74d4c9..36567907216b 100644
--- a/tools/topology/sof-imx8qxp-nocodec.m4
+++ b/tools/topology/sof-imx8-nocodec.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8-wm8960-mixer.m4 b/tools/topology/sof-imx8-wm8960-mixer.m4
index 32a1796f4d99..139f6c70877d 100644
--- a/tools/topology/sof-imx8-wm8960-mixer.m4
+++ b/tools/topology/sof-imx8-wm8960-mixer.m4
@@ -15,7 +15,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8qxp-wm8960.m4 b/tools/topology/sof-imx8-wm8960.m4
similarity index 98%
rename from tools/topology/sof-imx8qxp-wm8960.m4
rename to tools/topology/sof-imx8-wm8960.m4
index 66c964132f61..0492af77cbd9 100644
--- a/tools/topology/sof-imx8qxp-wm8960.m4
+++ b/tools/topology/sof-imx8-wm8960.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8mp-wm8960-kwd.m4 b/tools/topology/sof-imx8mp-wm8960-kwd.m4
index ef2c09fa2f40..21f46c530b2c 100644
--- a/tools/topology/sof-imx8mp-wm8960-kwd.m4
+++ b/tools/topology/sof-imx8mp-wm8960-kwd.m4
@@ -16,7 +16,7 @@ include(`sof/tokens.m4')
 
 include(`sai.m4')
 # Include i.MX8 DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 define(KWD_PIPE_SCH_DEADLINE_US, 20000)
 
diff --git a/tools/topology/sof-imx8mp-wm8960-mixer.m4 b/tools/topology/sof-imx8mp-wm8960-mixer.m4
index 72ce920daf38..ca3a0d3e9562 100644
--- a/tools/topology/sof-imx8mp-wm8960-mixer.m4
+++ b/tools/topology/sof-imx8mp-wm8960-mixer.m4
@@ -15,7 +15,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8mp-wm8960.m4 b/tools/topology/sof-imx8mp-wm8960.m4
index fa9c09a14424..34f8322680aa 100644
--- a/tools/topology/sof-imx8mp-wm8960.m4
+++ b/tools/topology/sof-imx8mp-wm8960.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines