diff --git a/06_generate_debian_console_root.sh b/06_generate_debian_console_root.sh
index 99fa204..cec4078 100755
--- a/06_generate_debian_console_root.sh
+++ b/06_generate_debian_console_root.sh
@@ -55,7 +55,7 @@ echo "    #fdtoverlays /overlays/<file>.dtbo" >> ./deploy/input/extlinux.conf
 
 mkdir -p ./ignore/.root/boot/firmware/ || true
 
-echo '/dev/mmcblk0p2  /boot/firmware/ auto  defaults  0  2' >> ./ignore/.root/etc/fstab
+echo '/dev/mmcblk0p2  /boot/firmware/  vfat  user,uid=1000,gid=1000,defaults  0  2' >> ./ignore/.root/etc/fstab
 echo '/dev/mmcblk0p3  /  auto  errors=remount-ro  0  1' >> ./ignore/.root/etc/fstab
 echo 'debugfs  /sys/kernel/debug  debugfs  mode=755,uid=root,gid=gpio,defaults  0  0' >> ./ignore/.root/etc/fstab
 
diff --git a/06_generate_ubuntu_console_root.sh b/06_generate_ubuntu_console_root.sh
index 4645a71..2d0b013 100755
--- a/06_generate_ubuntu_console_root.sh
+++ b/06_generate_ubuntu_console_root.sh
@@ -55,7 +55,7 @@ echo "    #fdtoverlays /overlays/<file>.dtbo" >> ./deploy/input/extlinux.conf
 
 mkdir -p ./ignore/.root/boot/firmware/ || true
 
-echo '/dev/mmcblk0p2  /boot/firmware/ auto  defaults  0  2' >> ./ignore/.root/etc/fstab
+echo '/dev/mmcblk0p2  /boot/firmware/  vfat  user,uid=1000,gid=1000,defaults  0  2' >> ./ignore/.root/etc/fstab
 echo '/dev/mmcblk0p3  /  auto  errors=remount-ro  0  1' >> ./ignore/.root/etc/fstab
 echo 'debugfs  /sys/kernel/debug  debugfs  mode=755,uid=root,gid=gpio,defaults  0  0' >> ./ignore/.root/etc/fstab
 
diff --git a/deploy/genimage.cfg b/deploy/genimage.cfg
index 9ada9da..4ef125c 100644
--- a/deploy/genimage.cfg
+++ b/deploy/genimage.cfg
@@ -18,7 +18,7 @@ image boot.vfat {
 
 image sdcard.img {
 	hdimage {
-		gpt = true
+		partition-table-type = "gpt"
 	}
 
 	partition uboot {
@@ -27,13 +27,13 @@ image sdcard.img {
 	}
 
 	partition kernel {
-		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
+		partition-type-uuid = F
 		bootable = "true"
 		image = "boot.vfat"
 	}
 
 	partition root {
-		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
+		partition-type-uuid = L
 		image = "root.ext4"
 	}
 }