diff --git a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks-imx.cfg b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks-imx.cfg
index 98664b73..6ee2f592 100644
--- a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks-imx.cfg
+++ b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks-imx.cfg
@@ -1,3 +1,3 @@
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_IS_NOWHERE=y
-CONFIG_CMD_SAVEENV=n
+CONFIG_ENV_IS_IN_MMC=n
diff --git a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks.cfg b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks.cfg
index 1db0a028..50de8a43 100644
--- a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks.cfg
+++ b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks.cfg
@@ -1,4 +1,4 @@
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_IS_NOWHERE=y
-CONFIG_CMD_SAVEENV=n
 CONFIG_USB_FUNCTION_FASTBOOT=n
+CONFIG_ENV_IS_IN_MMC=n
diff --git a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-allow-flashing-balenaOS.patch b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-allow-flashing-balenaOS.patch
index a86db0d4..e8c2576b 100644
--- a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-allow-flashing-balenaOS.patch
+++ b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-allow-flashing-balenaOS.patch
@@ -21,7 +21,7 @@ index 92f3cbae46..63d49fb479 100644
  setexpr a_script  ${a_base} + 0x00800000
  setexpr a_zImage  ${a_base} + 0x00800000
 -setexpr a_fdt     ${a_base} + 0x03000000
-+setexpr a_fdt     ${a_base} + 0x03200000
++setexpr a_fdt     ${a_base} + 0x03300000
  setexpr a_initrd  ${a_base} + 0x03100000
  setexpr a_reset_cause_marker ${a_base} + 0x80
  setexpr a_reset_cause	     ${a_base} + 0x84
diff --git a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-dwe-Integrate-with-BalenaOS.patch b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-dwe-Integrate-with-BalenaOS.patch
index 533a4813..a5383563 100644
--- a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-dwe-Integrate-with-BalenaOS.patch
+++ b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-dwe-Integrate-with-BalenaOS.patch
@@ -18,7 +18,7 @@ index 92f3cbae46..7677ed65f2 100644
  setexpr a_script  ${a_base} + 0x00800000
  setexpr a_zImage  ${a_base} + 0x00800000
 -setexpr a_fdt     ${a_base} + 0x03000000
-+setexpr a_fdt     ${a_base} + 0x03200000
++setexpr a_fdt     ${a_base} + 0x03300000
  setexpr a_initrd  ${a_base} + 0x03100000
  setexpr a_reset_cause_marker ${a_base} + 0x80
  setexpr a_reset_cause	     ${a_base} + 0x84