diff --git a/overlay/usr/lib/systemd/system-preset/42-coreos.preset b/overlay/usr/lib/systemd/system-preset/42-coreos.preset
index 1a7e6a0287..1843706440 100644
--- a/overlay/usr/lib/systemd/system-preset/42-coreos.preset
+++ b/overlay/usr/lib/systemd/system-preset/42-coreos.preset
@@ -9,3 +9,5 @@ enable afterburn-checkin.service
 enable afterburn-firstboot-checkin.service
 # Service to write SSH key snippets from cloud providers.
 enable afterburn-sshkeys@.service
+# mount /boot/efi
+enable boot-efi.mount
diff --git a/overlay/usr/lib/systemd/system/boot-efi.mount b/overlay/usr/lib/systemd/system/boot-efi.mount
new file mode 100644
index 0000000000..ca3490553c
--- /dev/null
+++ b/overlay/usr/lib/systemd/system/boot-efi.mount
@@ -0,0 +1,11 @@
+[Unit]
+Description=EFI System Partition
+Documentation=https://github.com/coreos/fedora-coreos-config
+ConditionPathExists=/boot/efi
+
+[Mount]
+What=/dev/disk/by-label/EFI-SYSTEM
+Where=/boot/efi
+
+[Install]
+RequiredBy=local-fs.target