diff --git a/Makefile b/Makefile
index 2fb1cab2..5f13a5de 100644
--- a/Makefile
+++ b/Makefile
@@ -52,14 +52,17 @@ image: bullseye bookworm banagotchi
 bullseye: clean packer
 	export=LC_ALL=en_GB.utf-8
 	cd builder && sudo /usr/bin/packer init data/32bit/pwnagotchi.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/32bit/pwnagotchi.json.pkr.hcl
+	cd ~ && sudo pishrink -vaZ pwnagotchi-$(PWN_VERSION)-32bit.img
 
 bookworm: clean packer
 	export=LC_ALL=en_GB.utf-8
 	cd builder && sudo /usr/bin/packer init data/64bit/pwnagotchi.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/64bit/pwnagotchi.json.pkr.hcl
+	cd ~ && sudo pishrink -vaZ pwnagotchi-$(PWN_VERSION)-64bit.img
 
 bananagotchi: clean packer
 	export=LC_ALL=C.utf-8
 	cd builder && sudo /usr/bin/packer init data/64bit/bananagotchi.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=bananagotchi" -var "pwn_version=$(PWN_VERSION)" data/64bit/bananagotchi.json.pkr.hcl
+	cd ~ && sudo pishrink -vaZ bananagotchi-$(PWN_VERSION).img
 
 clean:
 	- rm -rf /tmp/*
diff --git a/builder/data/32bit/pwnagotchi.json.pkr.hcl b/builder/data/32bit/pwnagotchi.json.pkr.hcl
index 3cfc5399..53224c3d 100644
--- a/builder/data/32bit/pwnagotchi.json.pkr.hcl
+++ b/builder/data/32bit/pwnagotchi.json.pkr.hcl
@@ -25,7 +25,7 @@ source "arm" "rpi32-pwnagotchi" {
   file_checksum_type            = "sha256"
   file_target_extension         = "xz"
   file_unarchive_cmd            = ["unxz", "$ARCHIVE_PATH"]
-  image_path                    = "../../pwnagotchi-rpi-bullseye-${var.pwn_version}-32bit.img"
+  image_path                    = "../../pwnagotchi-${var.pwn_version}-32bit.img"
   qemu_binary_source_path       = "/usr/libexec/qemu-binfmt/aarch64-binfmt-P"
   qemu_binary_destination_path  = "/usr/libexec/qemu-binfmt/aarch64-binfmt-P"
   image_build_method            = "resize"
diff --git a/builder/data/64bit/pwnagotchi.json.pkr.hcl b/builder/data/64bit/pwnagotchi.json.pkr.hcl
index 55f3e531..83e49e88 100644
--- a/builder/data/64bit/pwnagotchi.json.pkr.hcl
+++ b/builder/data/64bit/pwnagotchi.json.pkr.hcl
@@ -25,7 +25,7 @@ source "arm" "rpi64-pwnagotchi" {
   file_checksum_type            = "sha256"
   file_target_extension         = "xz"
   file_unarchive_cmd            = ["unxz", "$ARCHIVE_PATH"]
-  image_path                    = "../../../pwnagotchi-rpi-bookworm-${var.pwn_version}-64bit.img"
+  image_path                    = "../../../pwnagotchi-${var.pwn_version}-64bit.img"
   qemu_binary_source_path       = "/usr/libexec/qemu-binfmt/aarch64-binfmt-P"
   qemu_binary_destination_path  = "/usr/libexec/qemu-binfmt/aarch64-binfmt-P"
   image_build_method            = "resize"