diff --git a/builds/any/rootfs/jessie/common/overlay/etc/mtab.yml b/builds/any/rootfs/jessie/common/overlay/etc/mtab.yml
index 598e4c69..17e0a6bc 100644
--- a/builds/any/rootfs/jessie/common/overlay/etc/mtab.yml
+++ b/builds/any/rootfs/jessie/common/overlay/etc/mtab.yml
@@ -17,3 +17,11 @@ mounts:
     mount: ro
     dir: /mnt/onl/boot
     fsck: false
+
+  # ESP (EFI system partition)
+  EFI-BOOT:
+    mount: ro
+    dir: /mnt/onl/efi-boot
+    fsck: false
+    label: EFI System
+    optional: true
diff --git a/packages/base/all/initrds/loader-initrd-files/src/etc/mtab.yml b/packages/base/all/initrds/loader-initrd-files/src/etc/mtab.yml
index cb7635b1..17abb840 100644
--- a/packages/base/all/initrds/loader-initrd-files/src/etc/mtab.yml
+++ b/packages/base/all/initrds/loader-initrd-files/src/etc/mtab.yml
@@ -18,3 +18,11 @@ mounts:
     mount: rw
     dir: /mnt/onl/boot
     fsck: true
+
+  # ESP (EFI system partition)
+  EFI-BOOT:
+    mount: ro
+    dir: /mnt/onl/efi-boot
+    fsck: false
+    label: EFI System
+    optional: true