diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 219420c4..40f52e5c 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -14,29 +14,28 @@
       boot_options:
         - "dtoverlay=dwc2"
         - "dtoverlay=spi1-3cs"
-        - "dtparam=spi=on"
-        - "dtparam=i2c_arm=on"
         - "dtparam=i2c1=on"
+        - "dtparam=i2c_arm=on"
+        - "dtparam=spi=on"
         - "gpu_mem=16"
       modules:
         - "i2c-dev"
     services:
       enable:
-        - dphys-swapfile.service
-        - pwnagotchi.service
         - bettercap.service
-        - pwngrid-peer.service
+        - dphys-swapfile.service
         - fstrim.timer
+        - pwnagotchi.service
+        - pwngrid-peer.service
       disable:
-        - apt-daily.timer
-        - apt-daily.service
-        - apt-daily-upgrade.timer
         - apt-daily-upgrade.service
+        - apt-daily-upgrade.timer
+        - apt-daily.service
+        - apt-daily.timer
         - bluetooth.service
         - ifup@wlan0.service
-        - dnsmasq.service
-        - wpa_supplicant.service
         - triggerhappy.service
+        - wpa_supplicant.service
     packages:
       bettercap:
         # We will install bettercap from source
@@ -46,24 +45,24 @@
         # url: "https://github.com/evilsocket/pwngrid/releases/download/v1.10.3/pwngrid_linux_aarch64_v1.10.3.zip"
       apt:
         downgrade:
+          - libpcap-dev_1.9.1-4_arm64.deb
           - libpcap0.8-dev_1.9.1-4_arm64.deb
           - libpcap0.8_1.9.1-4_arm64.deb
-          - libpcap-dev_1.9.1-4_arm64.deb
         hold:
-          - libpcap-dev
-          - libpcap0.8
-          - libpcap0.8-dev
           - firmware-atheros
           - firmware-brcm80211
           - firmware-libertas
           - firmware-misc-nonfree
           - firmware-realtek
+          - libpcap-dev
+          - libpcap0.8
+          - libpcap0.8-dev
         remove:
-          - raspberrypi-net-mods
           - dhcpcd5
+          - nfs-common
+          - raspberrypi-net-mods
           - triggerhappy
           - wpasupplicant
-          - nfs-common
         install:
           - aircrack-ng
           - autoconf
@@ -71,7 +70,6 @@
           - bison
           - bluez
           - build-essential
-          - build-essential
           - dkms
           - dphys-swapfile
           - fbi
@@ -85,7 +83,6 @@
           - gcc-arm-none-eabi
           - git
           - libatlas-base-dev
-          - libatlas-base-dev
           - libavcodec58
           - libavformat58
           - libblas-dev
@@ -107,7 +104,6 @@
           - liblapack-dev
           - libncursesw5-dev
           - libnetfilter-queue-dev
-          - libnetfilter-queue-dev
           - libopenblas-dev
           - libopenjp2-7
           - libopenmpi-dev
@@ -123,7 +119,6 @@
           - libtiff5
           - libtool
           - libusb-1.0-0-dev
-          - libusb-1.0-0-dev
           - lsof
           - make
           - python3-flask
@@ -132,7 +127,6 @@
           - python3-pil
           - python3-pip
           - python3-smbus
-          - python3-smbus
           - qpdf
           - raspberrypi-kernel-headers
           - rsync
@@ -152,12 +146,10 @@
 
   tasks:
   - name: Create pi user
-    user:
-      name: pi
-      password: "{{ 'raspberry' | password_hash('sha512') }}"
-      shell: /bin/bash
-      generate_ssh_key: true
-      group: sudo
+    copy:
+      dest: /boot/userconf
+      content: |
+        pi:$6$3jNr0GA9KIyt4hmM$efeVIopdMQ8DGgEPCWWlbx3mJJNAYci1lEXGdlky0xPyjqwKNbwTL5SrCcpb4144C4IvzWjn7Iv.QjqmU7iyT/
 
   - name: change hostname
     lineinfile: