diff --git a/conf/machine/olimex-imx8mp-evb.conf b/conf/machine/olimex-imx8mp-evb.conf
index 6a9e4633..4964e2e3 100644
--- a/conf/machine/olimex-imx8mp-evb.conf
+++ b/conf/machine/olimex-imx8mp-evb.conf
@@ -47,8 +47,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-olimex.dtb \
 "
 
-IMX_DEFAULT_BOOTLOADER = "u-boot-imx"
-IMX_DEFAULT_KERNEL = "linux-imx"
+IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_KERNEL:use-nxp-bsp = "linux-fslc"
 
 UBOOT_CONFIG_BASENAME = "imx8mp_olimex"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"