diff --git a/Makefile b/Makefile
index 668b4fa4..e2786abf 100644
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,11 @@ image: clean packer
 
 bullseye: clean packer
 	export LC_ALL=en_GB.UTF-8
-	cd builder && sudo /usr/bin/packer init data/32bit/raspberrypi32.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/32bit/raspberrypi32.json.pkr.hcl
-	sudo pishrink -vaZ pwnagotchi-32bit.img
+	cd builder && sudo /usr/bin/packer init raspberrypi32.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" raspberrypi32.json.pkr.hcl
 
 bookworm: clean packer
 	export LC_ALL=en_GB.UTF-8
-	cd builder && sudo /usr/bin/packer init data/64bit/raspberrypi64.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/64bit/raspberrypi64.json.pkr.hcl
-	sudo pishrink -vaZ pwnagotchi-64bit.img
+	cd builder && sudo /usr/bin/packer init raspberrypi64.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" raspberrypi64.json.pkr.hcl
 
 clean:
 	- rm -rf /tmp/packer*
diff --git a/builder/combined.json.pkr.hcl b/builder/combined.json.pkr.hcl
index 920a618b..4186deeb 100644
--- a/builder/combined.json.pkr.hcl
+++ b/builder/combined.json.pkr.hcl
@@ -123,7 +123,7 @@ build {
   provisioner "ansible-local" {
     command         = "ANSIBLE_FORCE_COLOR=1 PYTHONUNBUFFERED=1 PWN_VERSION=${var.pwn_version} PWN_HOSTNAME=${var.pwn_hostname} ansible-playbook"
     extra_arguments = ["--extra-vars \"ansible_python_interpreter=/usr/bin/python3\""]
-    playbook_file   = "data/64bit/raspberrypi64.yml"
+    playbook_file   = "raspberrypi64.yml"
   }
 }
 
@@ -167,7 +167,7 @@ build {
   provisioner "ansible-local" {
     command         = "ANSIBLE_FORCE_COLOR=1 PYTHONUNBUFFERED=1 PWN_VERSION=${var.pwn_version} PWN_HOSTNAME=${var.pwn_hostname} ansible-playbook"
     extra_arguments = ["--extra-vars \"ansible_python_interpreter=/usr/bin/python3\""]
-    playbook_dir    = "data/32bit/extras/"
-    playbook_file   = "data/32bit/raspberrypi32.yml"
+    playbook_dir    = "extras/"
+    playbook_file   = "raspberrypi32.yml"
   }
 }
\ No newline at end of file
diff --git a/builder/data/32bit/extras/nexmon.yml b/builder/extras/nexmon.yml
similarity index 100%
rename from builder/data/32bit/extras/nexmon.yml
rename to builder/extras/nexmon.yml
diff --git a/builder/data/32bit/raspberrypi32.json.pkr.hcl b/builder/raspberrypi32.json.pkr.hcl
similarity index 96%
rename from builder/data/32bit/raspberrypi32.json.pkr.hcl
rename to builder/raspberrypi32.json.pkr.hcl
index 01f94209..0b7398bd 100644
--- a/builder/data/32bit/raspberrypi32.json.pkr.hcl
+++ b/builder/raspberrypi32.json.pkr.hcl
@@ -88,7 +88,7 @@ build {
   provisioner "ansible-local" {
     command         = "ANSIBLE_FORCE_COLOR=1 PYTHONUNBUFFERED=1 PWN_VERSION=${var.pwn_version} PWN_HOSTNAME=${var.pwn_hostname} ansible-playbook"
     extra_arguments = ["--extra-vars \"ansible_python_interpreter=/usr/bin/python3\""]
-    playbook_dir    = "data/32bit/extras/"
-    playbook_file   = "data/32bit/raspberrypi32.yml"
+    playbook_dir    = "extras/"
+    playbook_file   = "raspberrypi32.yml"
   }
 }
\ No newline at end of file
diff --git a/builder/data/32bit/raspberrypi32.yml b/builder/raspberrypi32.yml
similarity index 100%
rename from builder/data/32bit/raspberrypi32.yml
rename to builder/raspberrypi32.yml
diff --git a/builder/data/64bit/raspberrypi64.json.pkr.hcl b/builder/raspberrypi64.json.pkr.hcl
similarity index 98%
rename from builder/data/64bit/raspberrypi64.json.pkr.hcl
rename to builder/raspberrypi64.json.pkr.hcl
index 82b3f422..5d0ff792 100644
--- a/builder/data/64bit/raspberrypi64.json.pkr.hcl
+++ b/builder/raspberrypi64.json.pkr.hcl
@@ -95,6 +95,6 @@ build {
   provisioner "ansible-local" {
     command         = "ANSIBLE_FORCE_COLOR=1 PYTHONUNBUFFERED=1 PWN_VERSION=${var.pwn_version} PWN_HOSTNAME=${var.pwn_hostname} ansible-playbook"
     extra_arguments = ["--extra-vars \"ansible_python_interpreter=/usr/bin/python3\""]
-    playbook_file   = "data/64bit/raspberrypi64.yml"
+    playbook_file   = "raspberrypi64.yml"
   }
 }
\ No newline at end of file
diff --git a/builder/data/64bit/raspberrypi64.yml b/builder/raspberrypi64.yml
similarity index 100%
rename from builder/data/64bit/raspberrypi64.yml
rename to builder/raspberrypi64.yml