diff --git a/setup.sh b/setup.sh
index 018aa2e..a1cb3a7 100644
--- a/setup.sh
+++ b/setup.sh
@@ -845,7 +845,11 @@ function insert_zbm_postconf_hook () {
 
 function umount_all () {
     #3.10
-    umount '/mnt/efi'
+    if [[ "${part_schema}" = 'mbr' ]]; then
+        umount '/mnt/boot/syslinux'
+    else
+        umount '/mnt/efi'
+    fi
     zfs umount -a
     zpool export "${zpool_name}"
 }
@@ -858,8 +862,10 @@ function finalize_os_setup () {
     configure_reflector                         #3.5
     configure_zfs                               #3.6
     configure_zfs_mount_gen                     #3.7
-    set_new_uefi_boot_entries                   #3.8
-    insert_zbm_postconf_hook                    #3.9
+    if [[ "${part_schema}" = 'gpt' ]]; then
+        set_new_uefi_boot_entries               #3.8
+        insert_zbm_postconf_hook                #3.9
+    fi
     umount_all                                  #3.10
 }