diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf
index b6a99d8..46e317a 100644
--- a/meta-fii/meta-kudo/conf/machine/kudo.conf
+++ b/meta-fii/meta-kudo/conf/machine/kudo.conf
@@ -6,6 +6,7 @@
 
 FLASH_SIZE = "65536"
 FLASH_UBOOT_OFFSET:flash-65536 = "0"
+FLASH_UBOOT_ENV_OFFSET:flash-65536 = "1024"
 FLASH_KERNEL_OFFSET:flash-65536 = "2048"
 FLASH_ROFS_OFFSET:flash-65536 = "7168"
 FLASH_RWFS_OFFSET:flash-65536 = "62400"
diff --git a/meta-fii/meta-mori/conf/machine/mori.conf b/meta-fii/meta-mori/conf/machine/mori.conf
index 4d99cb2..e6acd17 100644
--- a/meta-fii/meta-mori/conf/machine/mori.conf
+++ b/meta-fii/meta-mori/conf/machine/mori.conf
@@ -5,6 +5,7 @@
 
 FLASH_SIZE = "65536"
 FLASH_UBOOT_OFFSET:flash-65536 = "0"
+FLASH_UBOOT_ENV_OFFSET:flash-65536 = "1024"
 FLASH_KERNEL_OFFSET:flash-65536 = "2048"
 FLASH_ROFS_OFFSET:flash-65536 = "7168"
 FLASH_RWFS_OFFSET:flash-65536 = "62400"
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass
index 8242c78..976e8b4 100644
--- a/meta-phosphor/classes/image_types_phosphor.bbclass
+++ b/meta-phosphor/classes/image_types_phosphor.bbclass
@@ -55,6 +55,9 @@
 # Fixed partition offsets
 FLASH_UBOOT_SPL_SIZE ?= "64"
 FLASH_UBOOT_OFFSET ?= "0"
+FLASH_UBOOT_ENV_OFFSET ?= "384"
+FLASH_UBOOT_ENV_OFFSET:flash-65536 ?= "896"
+FLASH_UBOOT_ENV_OFFSET:flash-131072 ?= "896"
 FLASH_KERNEL_OFFSET ?= "512"
 FLASH_KERNEL_OFFSET:flash-65536 ?= "1024"
 FLASH_KERNEL_OFFSET:flash-131072 ?= "1024"
@@ -301,7 +304,7 @@
     _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True),
                                'u-boot.%s' % d.getVar('UBOOT_SUFFIX',True)),
                   uboot_offset,
-                  int(d.getVar('FLASH_KERNEL_OFFSET', True)))
+                  int(d.getVar('FLASH_UBOOT_ENV_OFFSET', True)))
 
     _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True),
                                d.getVar('FLASH_KERNEL_IMAGE', True)),
@@ -468,7 +471,7 @@
     _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True),
                                'u-boot.%s' % d.getVar('UBOOT_SUFFIX',True)),
                   uboot_offset,
-                  int(d.getVar('FLASH_KERNEL_OFFSET', True)))
+                  int(d.getVar('FLASH_UBOOT_ENV_OFFSET', True)))
 
     _append_image(os.path.join(d.getVar('IMGDEPLOYDIR', True),
                                '%s.cpio.%s.fitImage' % (