diff --git a/conf/machine/imx8-nmhw23.conf b/conf/machine/imx8-nmhw23.conf
index a29de53..f351c3a 100644
--- a/conf/machine/imx8-nmhw23.conf
+++ b/conf/machine/imx8-nmhw23.conf
@@ -3,7 +3,10 @@
 #@DESCRIPTION: Machine configuration for the nmhw23 mainboard
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/arm/arch-arm64.inc
+# Prevent the use of imx mainline BSP
+IMX_DEFAULT_BSP = ""
+
+require conf/machine/include/tune-cortexa35.inc
 
 MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"