diff --git a/bigboot_execute_resize.yml b/bigboot_execute_resize.yml
index e33087e..7b51480 100644
--- a/bigboot_execute_resize.yml
+++ b/bigboot_execute_resize.yml
@@ -6,7 +6,7 @@
   strategy: free
 
   tasks:
-    - name: Enable filesystem check prior to performing disk activities
+    - name: Enable filesystem check prior to Bigboot execution
       ansible.builtin.import_role:
         name: autofsck
         tasks_from: main.yml
@@ -16,9 +16,17 @@
     - name: Flush handlers
       ansible.builtin.meta: flush_handlers
 
+    # Make sure to update the reboot code for the WF environment
     - name: Reboot to run filesystem check
       ansible.builtin.reboot:
 
+    - name: Disable filesystem check prior to Bigboot execution
+      ansible.builtin.import_role:
+        name: autofsck
+        tasks_from: cleanup.yml
+      when:
+        - (bigboot_execute_shrink_lv | bool or bigboot_execute_bigboot | bool)
+
     - name: Extend the timeout values for physical hosts
       ansible.builtin.set_fact:
         initramfs_post_reboot_delay: 300
@@ -42,11 +50,4 @@
       when:
         - bigboot_execute_bigboot | bool
 
-    - name: Remove filesystem check from Grub
-      ansible.builtin.import_role:
-        name: autofsck
-        tasks_from: cleanup.yml
-      when:
-        - (bigboot_execute_shrink_lv | bool or bigboot_execute_bigboot | bool)
-
 ...