diff --git a/conf/machine/nitrogen8mn.conf b/conf/machine/nitrogen8mn.conf
index f7f71c7..a3fd521 100644
--- a/conf/machine/nitrogen8mn.conf
+++ b/conf/machine/nitrogen8mn.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8M Nano
 #@MAINTAINER: Chris Dimich <chris.dimich@boundarydevices.com>
 
-MACHINEOVERRIDES =. "mx8mn:"
+MACHINEOVERRIDES =. "mx8mn:imx-boot-container:"
 
 IMX_DEFAULT_BSP ?= "nxp"
 
@@ -27,8 +27,6 @@ PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary"
 PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary"
 SPL_BINARY = "spl/u-boot-spl.bin"
-UBOOT_DTB_NAME ?= "imx8mn-nitrogen8_nano.dtb"
-UBOOT_MAKE_TARGET = ""
 UBOOT_SUFFIX = "bin"
 
 # Used to define the U-Boot defconfig for different board variants. The naming
@@ -42,12 +40,8 @@ BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8_nano_8mn1gr0"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard"
 
-# Set ATF platform name
 ATF_PLATFORM = "imx8mn"
 
-IMXBOOT_TARGETS = "flash_evk"
-IMX_BOOT_SOC_TARGET = "iMX8MN"
-
 DDR_FIRMWARE_NAME = "\
     lpddr4_pmu_train_1d_imem.bin \
     lpddr4_pmu_train_1d_dmem.bin \
@@ -58,7 +52,7 @@ DDR_FIRMWARE_NAME = "\
 IMAGE_BOOT_FILES:append = " \
 	boot.scr-${MACHINE};boot.scr \
 	upgrade.scr-${MACHINE};upgrade.scr \
-	imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
+	flash.bin-${MACHINE};u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
 "
 
 # wic support