diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json
index 1a3befc4..40707c01 100644
--- a/builder/pwnagotchi.json
+++ b/builder/pwnagotchi.json
@@ -3,13 +3,13 @@
     {
       "name": "pwnagotchi",
       "type": "arm-image",
-      "iso_url": "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-10-10/2023-10-10-raspios-bookworm-arm64-lite.img.xz",
-      "iso_checksum": "file:https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-10-10/2023-10-10-raspios-bookworm-arm64-lite.img.xz.sha256",
+      "iso_url": "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz",
+      "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": 8568709120,
       "qemu_binary": "qemu-aarch64-static",
-      "output_filename": "../../pwnagotchi-{{user `pwn_version`}}-bookworm-arm64.img",
+      "output_filename": "../../pwnagotchi-{{user `pwn_version`}}-arm64.img",
       "qemu_args": [
-        "-r", "6.1.0-rpi4-rpi-v8"
+        "-r", "6.1.21-v8+"
       ]
     }
   ],
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 9807211b..41bb2797 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -6,7 +6,7 @@
   vars:
     kernel:
       min: "6.1"
-      full: "6.1.0-rpi4-rpi-v8"
+      full: "6.1.21-v8+"
     pwnagotchi:
       hostname: "{{ lookup('env', 'PWN_HOSTNAME') | default('pwnagotchi', true) }}"
       version: "{{ lookup('env', 'PWN_VERSION') | default('pwnagotchi-torch', true) }}"
@@ -23,7 +23,6 @@
     services:
       enable:
         - bettercap.service
-        - dhcpcd
         - dphys-swapfile.service
         - fstrim.timer
         - pwnagotchi.service
@@ -71,7 +70,6 @@
           - bluez
           - build-essential
           - curl
-          - dhcpcd5
           - dkms
           - dphys-swapfile
           - fbi
@@ -85,8 +83,9 @@
           - gcc-arm-none-eabi
           - git
           - libatlas-base-dev
+          - libavcodec58
+          - libavformat58
           - libblas-dev
-          - libbluetooth3
           - libbz2-dev
           - libc-ares-dev
           - libc6-dev
@@ -118,7 +117,7 @@
           - libsqlite3-dev
           - libssl-dev
           - libswscale5
-          - libtiff6
+          - libtiff5
           - libtool
           - libusb-1.0-0-dev
           - lsof
@@ -263,7 +262,6 @@
 
   - 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"
-    with_items: "{{ kernel.full }}"
 
   - name: copy modified driver
     copy: