diff --git a/bigboot-noop.yml b/bigboot-noop.yml
index 6507a2e..e33fd4d 100644
--- a/bigboot-noop.yml
+++ b/bigboot-noop.yml
@@ -36,10 +36,13 @@
     - bigboot_vars.yml
 
   tasks:
-    - name: Perform filesystem check prior to Bigboot execution
+    - name: Perform service and filesystem checks prior to Bigboot execution
       when:
         - (bigboot_execute_shrink_lv | bool or bigboot_execute_bigboot | bool)
       block:
+        # - name: Check for and disable services exceeding the timeout threshold
+        #   ansible.builtin.import_tasks: tasks/check_systemd_services.yml
+
         - name: Enable Grub filesystem check
           ansible.builtin.import_role:
             name: autofsck
@@ -60,9 +63,6 @@
         - name: Flush handlers
           ansible.builtin.meta: flush_handlers
 
-        - name: Check for and disable services exceeding the timeout threshold
-          ansible.builtin.import_tasks: tasks/check_systemd_services.yml
-
 
     - name: Extend the timeout values for physical hosts
       ansible.builtin.set_fact:
@@ -85,12 +85,12 @@
       when:
         - bigboot_execute_bigboot | bool
 
-    - name: Re-enabling services previously disabled
-      ansible.builtin.service:
-        name: "{{ item }}"
-        state: started
-        enabled: true
-      loop: "{{ bigboot_systemd_disabled_services }}"
-      when:
-        - bigboot_systemd_disabled_services is defined
-        - bigboot_systemd_disabled_services | length > 0
+    # - name: Re-enabling services previously disabled
+    #   ansible.builtin.service:
+    #     name: "{{ item }}"
+    #     state: started
+    #     enabled: true
+    #   loop: "{{ bigboot_systemd_disabled_services }}"
+    #   when:
+    #     - bigboot_systemd_disabled_services is defined
+    #     - bigboot_systemd_disabled_services | length > 0
diff --git a/bigboot_execute_resize.yml b/bigboot_execute_resize.yml
index eb36994..e254548 100644
--- a/bigboot_execute_resize.yml
+++ b/bigboot_execute_resize.yml
@@ -13,8 +13,8 @@
       when:
         - (bigboot_execute_shrink_lv | bool or bigboot_execute_bigboot | bool)
       block:
-        - name: Check for and disable services exceeding the timeout threshold
-          ansible.builtin.import_tasks: tasks/check_systemd_services.yml
+        # - name: Check for and disable services exceeding the timeout threshold
+        #   ansible.builtin.import_tasks: tasks/check_systemd_services.yml
 
         - name: Enable Grub filesystem check
           ansible.builtin.import_role:
@@ -60,12 +60,12 @@
       when:
         - bigboot_execute_bigboot | bool
 
-    - name: Re-enabling services previously disabled
-      ansible.builtin.service:
-        name: "{{ item }}"
-        state: started
-        enabled: true
-      loop: "{{ bigboot_systemd_disabled_services }}"
-      when:
-        - bigboot_systemd_disabled_services is defined
-        - bigboot_systemd_disabled_services | length > 0
+    # - name: Re-enabling services previously disabled
+    #   ansible.builtin.service:
+    #     name: "{{ item }}"
+    #     state: started
+    #     enabled: true
+    #   loop: "{{ bigboot_systemd_disabled_services }}"
+    #   when:
+    #     - bigboot_systemd_disabled_services is defined
+    #     - bigboot_systemd_disabled_services | length > 0