diff --git a/overlay.d/05core/usr/lib/systemd/system/boot-efi.mount b/overlay.d/05core/usr/lib/systemd/system/boot-efi.mount
index ca3490553c..c4f171b225 100644
--- a/overlay.d/05core/usr/lib/systemd/system/boot-efi.mount
+++ b/overlay.d/05core/usr/lib/systemd/system/boot-efi.mount
@@ -1,11 +1,11 @@
 [Unit]
 Description=EFI System Partition
 Documentation=https://github.com/coreos/fedora-coreos-config
-ConditionPathExists=/boot/efi
+ConditionPathExists=/sys/firmware/efi/
 
 [Mount]
 What=/dev/disk/by-label/EFI-SYSTEM
 Where=/boot/efi
 
 [Install]
-RequiredBy=local-fs.target
+WantedBy=local-fs.target