diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml
index 6888ab9..85ef1bd 100644
--- a/bigboot_setup_environment.yml
+++ b/bigboot_setup_environment.yml
@@ -17,6 +17,8 @@
 
     - name: Set logical volume information
       ansible.builtin.import_tasks: tasks/capture_lv_device_details.yml
+      when:
+        - bigboot_execute_bigboot | default(false) | bool
 
     - name: Set environment for subsequent workflow nodes
       ansible.builtin.set_stats:
@@ -26,11 +28,11 @@
             combine({inventory_hostname:
               {
                 'bigboot_execute_bigboot': bigboot_execute_bigboot,
-                'bigboot_execute_shrink_lv': bigboot_execute_shrink_lv,
-                'bigboot_adjacent_lvm_device': bigboot_adjacent_lvm_device,
-                'bigboot_lv_shrink_size': bigboot_lv_shrink_size | int,
-                'bigboot_pv': bigboot_pv,
-                'bigboot_size_target': bigboot_size_target_fallback,
+                'bigboot_execute_shrink_lv': bigboot_execute_shrink_lv | default(false),
+                'bigboot_adjacent_lvm_device': bigboot_adjacent_lvm_device | default(omit),
+                'bigboot_lv_shrink_size': bigboot_lv_shrink_size | default(0) | int,
+                'bigboot_pv': bigboot_pv | default(omit),
+                'bigboot_size_target': bigboot_size_target_fallback | default(bigboot_size_target),
                 'ip_addresses': ansible_all_ipv4_addresses,
                 'server_hostname': ansible_hostname
               }