diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass
index f40dddc17..059a3e44f 100644
--- a/meta-digi-arm/classes/image_types_digi.bbclass
+++ b/meta-digi-arm/classes/image_types_digi.bbclass
@@ -251,7 +251,7 @@ BOARD_BOOTIMAGE_PARTITION_SIZE ??= "65536"
 # SD card image name
 SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sdcard"
 
-BOOTLOADER_SEEK ?= "1"
+BOOTLOADER_SEEK_USERDATA ?= "1"
 
 SDIMG_BOOTLOADER ?= "${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK}"
 SDIMG_BOOTFS_TYPE ?= "boot.vfat"
@@ -319,7 +319,7 @@ IMAGE_CMD:sdcard() {
 	gzip -d -k ${SDIMG_ROOTFS}.gz
 
 	# Burn bootloader, boot and rootfs partitions
-	dd if=${SDIMG_BOOT} of=${SDIMG} conv=notrunc,fsync seek=${BOOTLOADER_SEEK} bs=1K
+	dd if=${SDIMG_BOOT} of=${SDIMG} conv=notrunc,fsync seek=${BOOTLOADER_SEEK_USERDATA} bs=1K
 	dd if=${SDIMG_BOOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
 	dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024 + ${BOOT_SPACE_ALIGNED} \* 1024)
 
diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
index 41fb3bed9..c777dfd71 100644
--- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
@@ -24,6 +24,8 @@ UBOOT_CONFIG ??= "ccimx6qpsbc1GB ccimx6qpsbc2GB"
 UBOOT_CONFIG[ccimx6qpsbc1GB] = "ccimx6qpsbc1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 UBOOT_CONFIG[ccimx6qpsbc2GB] = "ccimx6qpsbc2GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
+BOOTLOADER_SEEK_BOOT = "1"
+
 KERNEL_DEVICETREE ?= " \
     imx6qp-ccimx6qpsbc.dtb \
     imx6qp-ccimx6qpsbc-id160.dtb \
diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index e10d3533a..d21eb1f9d 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -22,6 +22,8 @@ UBOOT_CONFIG[ccimx6qsbc2GB] = "ccimx6qsbc2GB_defconfig,,u-boot-dtb.${UBOOT_SUFFI
 UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
+BOOTLOADER_SEEK_BOOT = "1"
+
 KERNEL_DEVICETREE ?= " \
     imx6dl-ccimx6sbc.dtb \
     imx6dl-ccimx6sbc-w.dtb \
diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
index 24dffe4c7..b5b33f670 100644
--- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
@@ -8,7 +8,8 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:ccimx8m:${DIGI_FAMILY}:"
 # Include the machine configuration for Digi's ConnectCore 8M module.
 include conf/machine/include/ccimx8m.inc
 
-BOOTLOADER_SEEK = "33"
+BOOTLOADER_SEEK_USERDATA = "33"
+BOOTLOADER_SEEK_BOOT = "0"
 
 # U-Boot configurations
 # Last one is the default (the one the symlinks point at)
diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index 3a0b40ae9..21f16da00 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -8,7 +8,8 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:ccimx8m:${DIGI_FAMILY}:"
 # Include the machine configuration for Digi's ConnectCore 8M module.
 include conf/machine/include/ccimx8m.inc
 
-BOOTLOADER_SEEK = "32"
+BOOTLOADER_SEEK_USERDATA = "32"
+BOOTLOADER_SEEK_BOOT = "0"
 
 # U-Boot configurations
 # Last one is the default (the one the symlinks point at)
diff --git a/meta-digi-arm/conf/machine/ccimx8mp-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mp-dvk.conf
index fe503c9db..61e6a7db5 100644
--- a/meta-digi-arm/conf/machine/ccimx8mp-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mp-dvk.conf
@@ -12,7 +12,8 @@ MACHINE_FEATURES:remove = "wifi bluetooth"
 DIGI_FAMILY = "ccimx8mp"
 MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:ccimx8m:${DIGI_FAMILY}:"
 
-BOOTLOADER_SEEK = "32"
+BOOTLOADER_SEEK_USERDATA = "32"
+BOOTLOADER_SEEK_BOOT = "0"
 
 # U-Boot configurations
 # Last one is the default (the one the symlinks point at)
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index a017cda14..b116c959d 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -16,8 +16,10 @@ UBOOT_HAS_FASTBOOT = "true"
 # The bootloader image that gets flashed consists of U-Boot and several fw binaries
 EXTRA_IMAGEDEPENDS = "imx-boot"
 BOOTLOADER_IMAGE_RECIPE = "imx-boot"
-# BOOTLOADER_SEEK is 33 for step A of the silicon and 32 for step B
-BOOTLOADER_SEEK = "32"
+# BOOTLOADER_SEEK_USERDATA is 33 for step A of the silicon and 32 for step B
+BOOTLOADER_SEEK_USERDATA = "32"
+# BOOTLOADER_SEEK_BOOT is 32 for step B of silicon and 0 for step C
+BOOTLOADER_SEEK_BOOT ?= "0"
 BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin"
 SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"