diff --git a/bigboot-noop.yml b/bigboot-noop.yml
index ef4f4be..8b6fb37 100644
--- a/bigboot-noop.yml
+++ b/bigboot-noop.yml
@@ -23,7 +23,7 @@
   ansible.builtin.import_playbook: rhc.rear.rear_backup
   when:
     - bigboot_execute_bigboot | bool
-    - not bigboot_skip_rear_backup | bool
+    # - not bigboot_skip_rear_backup | bool
 
 
 - name: Perform logical volume and boot parition resizing as needed
@@ -32,6 +32,9 @@
   gather_facts: true
   strategy: free
 
+  vars_files:
+    - bigboot_vars.yml
+
   tasks:
     - name: Perform filesystem check prior to Bigboot execution
       when:
@@ -88,3 +91,6 @@
         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/requirements.yml b/collections/requirements.yml
similarity index 78%
rename from requirements.yml
rename to collections/requirements.yml
index 9a4c623..1f04f19 100644
--- a/requirements.yml
+++ b/collections/requirements.yml
@@ -1,10 +1,4 @@
 ---
-roles:
-  - name: autofsck
-    src: https://gitea.thezengarden.net/ansible_roles/autofsck.git
-    scm: git
-    version: main
-
 collections:
 #  - name: infra.lvm_snapshots.shrink_lv
 #    source: https://github.com/redhat-cop/infra.lvm_snapshots.git
diff --git a/vars/bigboot_vars.yml b/vars/bigboot_vars.yml
index 082e19e..8bf1cf0 100644
--- a/vars/bigboot_vars.yml
+++ b/vars/bigboot_vars.yml
@@ -2,6 +2,8 @@
 bigboot_size_target: 1G
 ansible_ssh_retries: 10
 
+bigboot_skip_rear_backup: false
+
 # Max value in minutes for the timeout threshold:
 bigboot_service_max_timeout: 2
 
@@ -11,5 +13,5 @@ bigboot_protected_services:
   - user@0.service
   - network
   - rhnsd.service
-  # - rhnsd
+  - rhnsd
   - boksm.service