diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 0fdd889c3..a91dd0a16 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -180,7 +180,8 @@ def install_grub(efi_directory, fw_type):
         check_chroot_call(
             [libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi",
              "--efi-directory={!s}".format(efi_directory),
-             "--bootloader-id={!s}".format(efi_bootloader_id)])
+             "--bootloader-id={!s}".format(efi_bootloader_id),
+             "--force"])
         # Workaround for some UEFI firmwares
         check_chroot_call(["mkdir", "-p", "{!s}/boot".format(efi_directory_firmware)])
         check_chroot_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware,
diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf
index 5da436754..68e214ed3 100644
--- a/src/modules/mount/mount.conf
+++ b/src/modules/mount/mount.conf
@@ -14,7 +14,6 @@ extraMounts:
       mountPoint: /run
 
 extraMountsEfi:
-    - device: /sys/firmware/efi
-      mountPoint: /sys/firmware/efi
-      options: bind
-
+    - device: efivarfs
+      fs: efivarfs
+      mountPoint: /sys/firmware/efi/efivars