diff --git a/builder/combined.json.pkr.hcl b/builder/combined.json.pkr.hcl
index deb015ca..96d196e1 100644
--- a/builder/combined.json.pkr.hcl
+++ b/builder/combined.json.pkr.hcl
@@ -32,7 +32,7 @@ source "arm-image" "rpi32-pwnagotchi" {
   qemu_binary     = "qemu-arm-static"
   qemu_args       = ["-cpu", "arm1176"]
   image_arch      = "arm"
-  target_image_size =  9969908736
+  target_image_size = 9969908736
 }
 
 # a build block invokes sources and runs provisioning steps on them. The
diff --git a/builder/raspberrypi32.json.pkr.hcl b/builder/raspberrypi32.json.pkr.hcl
index 96efed4c..1e2f0a55 100644
--- a/builder/raspberrypi32.json.pkr.hcl
+++ b/builder/raspberrypi32.json.pkr.hcl
@@ -1,9 +1,5 @@
 packer {
   required_plugins {
-    #arm = {
-    #  version = ">=1.0.0"
-    #  source  = "github.com/michalfita/cross"
-    #}
     ansible = {
       source  = "github.com/hashicorp/ansible"
       version = ">= 1.1.1"
@@ -27,7 +23,9 @@ source "arm-image" "rpi32-pwnagotchi" {
   qemu_binary     = "qemu-arm-static"
   qemu_args       = ["-cpu", "arm1176"]
   image_arch      = "arm"
-  target_image_size =  9969908736
+  image_mounts    = ["/boot/firmware","/"]
+  target_image_size = 9969908736
+  last_partition_extra_size = 9221225472
 }
 
 build {
diff --git a/builder/raspberrypi64.json.pkr.hcl b/builder/raspberrypi64.json.pkr.hcl
index 8f55e335..87bec510 100644
--- a/builder/raspberrypi64.json.pkr.hcl
+++ b/builder/raspberrypi64.json.pkr.hcl
@@ -21,7 +21,7 @@ source "arm-image" "rpi64-pwnagotchi" {
   iso_checksum    = "sha256:58a3ec57402c86332e67789a6b8f149aeeb4e7bb0a16c9388a66ea6e07012e45"
   output_filename = "../../../pwnagotchi-64bit.img"
   qemu_binary     = "qemu-aarch64-static"
-  target_image_size =  9969908736
+  target_image_size = 9969908736
 }
 
 # a build block invokes sources and runs provisioning steps on them. The