diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index d4b1aaac..dbc47968 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -33,10 +33,10 @@
         source: "https://github.com/jayofelony/pwngrid.git"
         url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.7/pwngrid-1.10.7-armhf.zip"
       torch:
-        wheel: "torch-2.1.0a0+gita8e7c98-cp311-cp311-linux_armv6ll.whl"
+        wheel: "torch-2.1.0a0+gita8e7c98-cp311-cp311-linux_armv6l.whl"
         url: "https://github.com/Sniffleupagus/Torch4Pizero/releases/download/py0torch-bookworm-2024-05/torch-2.1.0a0+gita8e7c98-cp311-cp311-linux_armv6l.whl"
       torchvision:
-        wheel: "torchvision-0.16.0+fbb4cc5-cp311-cp311-linux_armv6ll.whl"
+        wheel: "torchvision-0.16.0+fbb4cc5-cp311-cp311-linux_armv6l.whl"
         url: "https://github.com/Sniffleupagus/Torch4Pizero/releases/download/py0torch-bookworm-2024-05/torchvision-0.16.0+fbb4cc5-cp311-cp311-linux_armv6l.whl"
       apt:
         downgrade:
@@ -55,7 +55,6 @@
           - libpcap0.8-dbg
           - libpcap0.8-dev
         remove:
-          - avahi-daemon
           - nfs-common
           - triggerhappy
           - wpasupplicant
@@ -81,18 +80,21 @@
           - git
           - libatlas-base-dev
           - libc6-dev
+          - libcpuinfo-dev
           - libcurl-ocaml-dev
           - libdbus-1-dev
           - libdbus-glib-1-dev
           - libfl-dev
           - libgmp3-dev
           - libnetfilter-queue-dev
+          - libopenblas-dev # https://stackoverflow.com/questions/14570011/explain-why-numpy-should-not-be-imported-from-source-directory
           - libopenjp2-7
           - libpcap-dev
           - libraspberrypi-bin
           - libraspberrypi-dev
           - libraspberrypi-doc
           - libraspberrypi0
+          - libsleef-dev
           - libssl-dev
           - libssl-ocaml-dev
           - libtool
@@ -102,6 +104,7 @@
           - pkg-config
           - python3-dev
           - python3-pip
+          - python3-protobuf
           - python3-setuptools
           - qpdf
           - raspberrypi-kernel-headers
diff --git a/builder/raspberrypi64.json.pkr.hcl b/builder/raspberrypi64.json.pkr.hcl
index 3d7c2e04..1e22695d 100644
--- a/builder/raspberrypi64.json.pkr.hcl
+++ b/builder/raspberrypi64.json.pkr.hcl
@@ -1,8 +1,8 @@
 packer {
   required_plugins {
     arm = {
-      version = "1.0.0"
-      source  = "github.com/cdecoux/builder-arm"
+      version = ">=1.0.0"
+      source  = "github.com/michalfita/cross"
     }
     ansible = {
       source  = "github.com/hashicorp/ansible"
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index 2b7fb36a..75d50b21 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -51,7 +51,6 @@
           - libpcap0.8-dbg
           - libpcap0.8-dev
         remove:
-          - avahi-daemon
           - dhpys-swapfile
           - nfs-common
           - triggerhappy
@@ -407,6 +406,7 @@
         - /usr/lib/firmware/brcm/brcmfmac43436-sdio.clm_blob
         - /usr/lib/firmware/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.clm_blob
         - /usr/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
+        - /usr/lib/firmware/brcm/BCM43430A1.raspberrypi,model-zero-2-w.hcd
 
     - name: backup original driver
       command: "mv /usr/lib/modules/{{ kernel.full }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko.xz /usr/lib/modules/{{ kernel.full }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko.xz.orig"
diff --git a/pwnagotchi/plugins/default/fix_services.py b/pwnagotchi/plugins/default/fix_services.py
index 16c9b77c..6f23df26 100644
--- a/pwnagotchi/plugins/default/fix_services.py
+++ b/pwnagotchi/plugins/default/fix_services.py
@@ -106,7 +106,7 @@ class FixServices(plugins.Plugin):
         other_last_lines = ''.join(list(TextIOWrapper(subprocess.Popen(['journalctl', '-n10'],
                                                                        stdout=subprocess.PIPE).stdout))[-10:])
         other_other_last_lines = ''.join(
-            list(TextIOWrapper(subprocess.Popen(['tail', '-n10', '/var/log/pwnagotchi.log'],
+            list(TextIOWrapper(subprocess.Popen(['tail', '-n10', '/etc/pwnagotchi/log/pwnagotchi.log'],
                                                 stdout=subprocess.PIPE).stdout))[-10:])
         # don't check if we ran a reset recently
         logging.debug("[Fix_Services]**** epoch")