diff --git a/bigboot-op.yml b/bigboot-op.yml
index 7da7fc9..f796539 100644
--- a/bigboot-op.yml
+++ b/bigboot-op.yml
@@ -18,6 +18,7 @@
 
 - name: Import hi playbook
   ansible.builtin.import_playbook: rhc.rear.hi
+  when: bigboot_expansion_diff | int <= 0
 
 
 - name: Expand the /boot partition
@@ -27,23 +28,18 @@
   strategy: free
 
   tasks:
-    - name: Do we have bigboot_size
-      ansible.builtin.debug:
-        msg: "bigboot_size == {{ bigboot_size }}"
+    - name: Execute Shrink_LV/Bigboot as needed
+      when: bigboot_expansion_diff | int <= 0
+      block:
+      - name: Execute Shrink_LV role to resize target logical volume
+        ansible.builtin.import_role:
+          name: infra.lvm_snapshots.shrink_lv
+        vars:
+          shrink_lv_devices:
+            - device: "{{ bigboot_adjacent_lvm_device | trim }}"
+              size: "{{ bigboot_lv_shrink_size | int }}"
+        when: bigboot_execute_shrink_lv | bool
 
-    - name: Do we have bigboot_adjacent_lvm_device
-      ansible.builtin.debug:
-        msg: "bigboot_adjacent_lvm_device == {{ bigboot_adjacent_lvm_device }}"
-
-    - name: Execute Shrink_LV role to resize target logical volume
-      ansible.builtin.import_role:
-        name: infra.lvm_snapshots.shrink_lv
-      vars:
-        shrink_lv_devices:
-          - device: "{{ bigboot_adjacent_lvm_device | trim }}"
-            size: "{{ bigboot_lv_shrink_size | int }}"
-      when: bigboot_execute_shrink_lv | bool
-
-    - name: Expand the /boot partition as requested
-      ansible.builtin.include_role:
-        name: infra.lvm_snapshots.bigboot
+      - name: Expand the /boot partition as requested
+        ansible.builtin.include_role:
+          name: infra.lvm_snapshots.bigboot