diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json
index c518f20e..28766b6e 100644
--- a/builder/pwnagotchi.json
+++ b/builder/pwnagotchi.json
@@ -7,15 +7,7 @@
       "iso_checksum": "file:https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256",
       "target_image_size": 9368709120,
       "qemu_binary": "qemu-aarch64-static",
-      "output_filename": "images/pwnagotchi-{{user `pwn_version`}}-arm64.img",
-      "chroot_mounts": [
-        ["proc", "proc", "/proc"],
-        ["sysfs", "sysfs", "/sys"],
-        ["bind", "/dev", "/dev"],
-        ["devpts", "devpts", "/dev/pts"],
-        ["binfmt_misc", "binfmt_misc", "/proc/sys/fs/binfmt_misc"],
-        ["bind", "/run/systemd", "/run/systemd"]
-      ]
+      "output_filename": "images/pwnagotchi-{{user `pwn_version`}}-arm64.img"
     }
   ],
   "provisioners": [
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index e5f13003..4387bb01 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -29,11 +29,8 @@
         - apt-daily.service
         - apt-daily-upgrade.timer
         - apt-daily-upgrade.service
-        - wpa_supplicant.service
         - bluetooth.service
-        - triggerhappy.service
         - ifup@wlan0.service
-        - dnsmasq.service
     packages:
       bettercap:
         # We will install bettercap from source
@@ -50,7 +47,7 @@
           - raspberrypi-net-mods
           - dhcpcd5
           - triggerhappy
-          - wpa_supplicant
+          - wpasupplicant
           - nfs-common
           - libraspberrypi0
           - libraspberrypi-dev
@@ -397,30 +394,6 @@
     apt:
       autoremove: yes
 
-  - name: download old libpcap packages
-    get_url:
-      url: "{{ item }}"
-      dest: /usr/local/src/
-      loop:
-        - http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap0.8-dev_1.9.1-3_arm64.deb
-        - http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap0.8_1.9.1-3_arm64.deb
-        - http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap-dev_1.9.1-3_arm64.deb
-
-  - name: install old libpcap packages
-    become_user: root
-    apt:
-      deb: /usr/local/src/libpcap*
-      args: allow-downgrades
-    register: libpcap
-
-  - name: add firmware packages to hold
-    become_user: root
-    dpkg_selections:
-      name: "{{ item }}"
-      selection: hold
-    with_items: "{{ packages.apt.hold }}"
-    when: libpcap.changed
-
   - name: disable unecessary services
     become_user: root
     systemd: