diff --git a/bigboot-v3.yml b/bigboot-v3.yml
index 0070ee1..09e32f5 100644
--- a/bigboot-v3.yml
+++ b/bigboot-v3.yml
@@ -4,6 +4,9 @@
   become: false
   gather_facts: true
 
+  vars:
+    bigboot_target_size: "{{ bigboot_size }}"
+
   tasks:
     - name: Capture boot device details
       ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml
diff --git a/group_vars/all b/group_vars/all
index 0258644..3b95118 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -2,7 +2,3 @@
 # Default size for Bigboot if otherwise
 # not defined
 bigboot_size: 1G
-
-# Set initial size target
-# (AAP bug?)
-bigboot_size_target: "{{ bigboot_size }}"