diff --git a/FunKey/board/funkey/genimage.cfg b/FunKey/board/funkey/genimage.cfg
index 5fb7632..a41ef43 100644
--- a/FunKey/board/funkey/genimage.cfg
+++ b/FunKey/board/funkey/genimage.cfg
@@ -1,7 +1,7 @@
 image sdcard.img {
 	hdimage {
 		gpt = true
-		gpt-location = 800K # 688128 # 672K
+		gpt-location = 800K
 	}
 
 #	partition gpt-header {
@@ -17,17 +17,12 @@ image sdcard.img {
 		size = 536K # 544KB - 8KB
 	}
 
-#	partition u-boot-env {
-#		in-partition-table = "no"
-#		offset = 544K
-#		size = 128K
-#	}
-
-#	partition u-boot_alt-env {
-#		in-partition-table = "no"
-#		offset = 672K
-#		size = 128K
-#	}
+	partition u-boot-env {
+		in-partition-table = "no"
+		offset = 544K
+		size = 128K
+		image = "u-boot-env.img"
+	}
 
 #	partition gpt-table {
 #		in-partition-table = "no"
diff --git a/FunKey/board/funkey/post-build.sh b/FunKey/board/funkey/post-build.sh
index 57f26e1..2dd7f35 100755
--- a/FunKey/board/funkey/post-build.sh
+++ b/FunKey/board/funkey/post-build.sh
@@ -13,3 +13,6 @@ rm -f ${TARGET_DIR}/etc/init.d/S01syslogd ${TARGET_DIR}/etc/init.d/S02klogd
 
 # Change dropbear init sequence
 mv ${TARGET_DIR}/etc/init.d/S50dropbear ${TARGET_DIR}/etc/init.d/S42dropbear
+
+# Generate U-Boot environment
+${HOST_DIR}/bin/mkenvimage -p 0x0 -s 0x20000 -o ${BINARIES_DIR}/u-boot-env.img ${TARGET_DIR}/etc/u-boot.env
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot
index eadac62..d4e85e6 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot
@@ -72,11 +72,6 @@ resize_rootfs_filesystem () {
     return 0
 }
 
-write_bootloader_env () {
-    fw_saveenv /etc/u-boot.env || die 11 "cannot write bootloader inevrionment, aborting"
-    return 0
-}
-
 create_swap_file () {
     local root_part_line=$(df | grep /dev/root)
     set ${root_part_line}
@@ -137,31 +132,28 @@ notif "First boot detected!"
 check_swap
 check_root_id
 
-notif "1/9 Resize root partition"
+notif "1/8 Resize root partition"
 resize_rootfs_partition
 
-notif "2/9 Reload partition table"
+notif "2/8 Reload partition table"
 reload_partition_table
 
-notif "3/9 Resize root filsystem"
+notif "3/8 Resize root filsystem"
 resize_rootfs_filesystem
 
-notif "4/9 Write boot environment"
-write_bootloader_env
-
-notif "5/9 Create swap"
+notif "4/8 Create swap"
 create_swap_file
 
-notif "6/9 Enable swap"
+notif "5/8 Enable swap"
 enable_swap_file
 
-notif "6/9 Create share partition"
+notif "6/8 Create share partition"
 create_backing_store_partition
 
-notif "8/9 Reload partition table"
+notif "7/8 Reload partition table"
 reload_partition_table
 
-notif "9/9 Format share partition"
+notif "8/8 Format share partition"
 format_backing_store_partition
 
 notif "First boot setup finished!"