diff --git a/bigboot-v3.yml b/bigboot-v3.yml
index a702078..f7f6a49 100644
--- a/bigboot-v3.yml
+++ b/bigboot-v3.yml
@@ -4,6 +4,8 @@
   become: false
   gather_facts: true
 
+  vars:
+    bigboot_size: "{{ bigboot_aap_size | default('1G') }}"
 
   tasks:
     - name: Capture boot device details
diff --git a/group_vars/all b/group_vars/all
deleted file mode 100644
index 3b95118..0000000
--- a/group_vars/all
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# Default size for Bigboot if otherwise
-# not defined
-bigboot_size: 1G