diff --git a/modules/image/builder.nix b/modules/image/builder.nix
index f510fe7..4f194d8 100644
--- a/modules/image/builder.nix
+++ b/modules/image/builder.nix
@@ -15,7 +15,7 @@ let
         Type = "root";
         Minimize = "best";
         Format = "erofs";
-        MakeDirectories = "/home /root /etc /dev /sys /bin /var /proc /run /usr /usr/bin /srv /tmp /mnt /lib /efi";
+        MakeDirectories = "/home /root /etc /dev /sys /bin /var /proc /run /usr /usr/bin /srv /tmp /mnt /lib /boot";
         Verity = "data";
         VerityMatchKey = "root";
         SplitName = "root";
diff --git a/modules/image/default.nix b/modules/image/default.nix
index dc705e9..20d7fa7 100644
--- a/modules/image/default.nix
+++ b/modules/image/default.nix
@@ -22,6 +22,7 @@
   systemd.repart.partitions = {
     "10-esp" = {
       Type = "esp";
+      UUID = "c12a7328-f81f-11d2-ba4b-00a0c93ec93b"; # Well known
       Format = "vfat";
       SizeMinBytes = "96M";
       SizeMaxBytes = "96M";