diff --git a/handlers/main.yml b/handlers/main.yml
index 60192b4..bfc6e4a 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -13,6 +13,15 @@
   args:
       warn: false
 
+- name: remount var_tmp
+  command: mount -o remount /var/tmp
+  args:
+      warn: false
+
+- name: remount home
+  command: mount -o remount /home
+  args:
+      warn: false
 - name: systemd daemon reload
   systemd:
       daemon_reload: true
diff --git a/tasks/prelim.yml b/tasks/prelim.yml
index 4c89947..3905a47 100644
--- a/tasks/prelim.yml
+++ b/tasks/prelim.yml
@@ -35,13 +35,6 @@
 
 - name: set bootloader type
   block:
-      - name: "PRELIM | set fact if UEFI boot | RHEL or OEL"
-        set_fact:
-            amazon2cis_bootloader_file: /boot/efi/EFI/redhat/grub.cfg
-            amazon2cis_legacy_boot: false
-        when:
-            - amazon2cis_efi_boot.stat.exists
-            - ansible_distribution != 'CentOS'  # Note: rhel & OEL both use redhat path
 
       - name: "PRELIM | set fact if UEFI boot | Amazon Linux 2 "
         set_fact:
@@ -49,7 +42,7 @@
             amazon2cis_legacy_boot: false
         when:
             - amazon2cis_efi_boot.stat.exists
-            - ansible_distribution == 'CentOS'
+            - ansible_distribution == 'Amazon'
 
       - name: "PRELIM | set if not UEFI boot"
         set_fact: