diff --git a/Makefile b/Makefile
index a57d3671..af3fa619 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ $(SDIST): setup.py pwnagotchi
 $(PWN_RELEASE).img: | $(PACKER)
 
 # If the packer or ansible files are updated, rebuild the image.
-$(PWN_RELEASE).img: $(SDIST) builder/pwnagotchi.json.pkr.hcl builder/pwnagotchi.yml $(shell find builder/data -type f)
+$(PWN_RELEASE).img: $(SDIST) builder/pwnagotchi.json.pkr.hcl builder/raspberrypi.yml $(shell find builder/data -type f)
 
 	# sudo $(PACKER) plugins install github.com/solo-io/arm-image
 	# sudo $(PACKER) plugins install github.com/hashicorp/ansible
diff --git a/builder/orangepi.yml b/builder/orangepi.yml
new file mode 100644
index 00000000..0884395d
--- /dev/null
+++ b/builder/orangepi.yml
@@ -0,0 +1,475 @@
+---
+- hosts:
+    - 127.0.0.1
+  gather_facts: true
+  become: true
+  vars:
+    kernel:
+      min: "6.1"
+      full: "6.1.21-v8+"
+    pwnagotchi:
+      hostname: "{{ lookup('env', 'PWN_HOSTNAME') | default('pwnagotchi', true) }}"
+      version: "{{ lookup('env', 'PWN_VERSION') | default('pwnagotchi-torch', true) }}"
+    system:
+      boot_options:
+        - "dtoverlay=dwc2"
+        - "dtoverlay=spi1-3cs"
+        - "dtparam=i2c1=on"
+        - "dtparam=i2c_arm=on"
+        - "dtparam=spi=on"
+        - "gpu_mem=16"
+      modules:
+        - "i2c-dev"
+    services:
+      enable:
+        - bettercap.service
+        - dphys-swapfile.service
+        - fstrim.timer
+        - pwnagotchi.service
+        - pwngrid-peer.service
+      disable:
+        - apt-daily-upgrade.service
+        - apt-daily-upgrade.timer
+        - apt-daily.service
+        - apt-daily.timer
+        - bluetooth.service
+        - ifup@wlan0.service
+        - triggerhappy.service
+        - wpa_supplicant.service
+    packages:
+      bettercap:
+        # We will install bettercap from source
+        # url: "https://github.com/jayofelony/bettercap/releases/download/2.32.1/bettercap-2.32.1.zip"
+        ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip"
+      pwngrid:
+        # 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
+        hold:
+          - firmware-atheros
+          - firmware-brcm80211
+          - firmware-libertas
+          - firmware-misc-nonfree
+          - firmware-realtek
+          - libpcap-dev
+          - libpcap0.8
+          - libpcap0.8-dev
+        remove:
+          - nfs-common
+          - raspberrypi-net-mods
+          - triggerhappy
+          - wpasupplicant
+        install:
+          - aircrack-ng
+          - autoconf
+          - bc
+          - bison
+          - bluez
+          - build-essential
+          - curl
+          - dkms
+          - dphys-swapfile
+          - fbi
+          - flex
+          - fonts-dejavu
+          - fonts-dejavu-core
+          - fonts-dejavu-extra
+          - fonts-freefont-ttf
+          - g++
+          - gawk
+          - gcc-arm-none-eabi
+          - git
+          - libatlas-base-dev
+          - libavcodec58
+          - libavformat58
+          - libblas-dev
+          - libbz2-dev
+          - libc-ares-dev
+          - libc6-dev
+          - libcap-dev
+          - libdbus-1-dev
+          - libdbus-glib-1-dev
+          - libeigen3-dev
+          - libelf-dev
+          - libffi-dev
+          - libfl-dev
+          - libfuse-dev
+          - libgdbm-dev
+          - libgl1-mesa-glx
+          - libgmp3-dev
+          - libgstreamer1.0-0
+          - libhdf5-dev
+          - liblapack-dev
+          - libncursesw5-dev
+          - libnetfilter-queue-dev
+          - libopenblas-dev
+          - libopenjp2-7
+          - libopenmpi-dev
+          - libopenmpi3
+          - libpcap-dev
+          - libraspberrypi-bin
+          - libraspberrypi-dev
+          - libraspberrypi-doc
+          - libraspberrypi0
+          - libsqlite3-dev
+          - libssl-dev
+          - libswscale5
+          - libtiff5
+          - libtool
+          - libusb-1.0-0-dev
+          - lsof
+          - make
+          - python3-dbus
+          - python3-flask
+          - python3-flask-cors
+          - python3-flaskext.wtf
+          - python3-pil
+          - python3-pip
+          - python3-smbus
+          - qpdf
+          - raspberrypi-kernel-headers
+          - rsync
+          - screen
+          - tcpdump
+          - texinfo
+          - time
+          - tk-dev
+          - unzip
+          - vim
+          - wget
+          - wl
+          - xxd
+          - zlib1g-dev
+  environment:
+    ARCHFLAGS: "-arch aarch64"
+
+  tasks:
+    - name: get ansible facts
+      debug:
+        var: ansible_facts
+
+    - name: Create pi user
+      copy:
+        dest: /boot/userconf
+        content: |
+          pi:$6$3jNr0GA9KIyt4hmM$efeVIopdMQ8DGgEPCWWlbx3mJJNAYci1lEXGdlky0xPyjqwKNbwTL5SrCcpb4144C4IvzWjn7Iv.QjqmU7iyT/
+
+    - name: change hostname
+      lineinfile:
+        dest: /etc/hostname
+        regexp: '^raspberrypi'
+        line: "{{pwnagotchi.hostname}}"
+        state: present
+      when: lookup('file', '/etc/hostname') == "raspberrypi"
+      register: hostname
+
+    - name: add hostname to /etc/hosts
+      lineinfile:
+        dest: /etc/hosts
+        regexp: '^127\.0\.1\.1[ \t]+raspberrypi'
+        line: "127.0.1.1\t{{pwnagotchi.hostname}}"
+        state: present
+      when: hostname.changed
+
+    - name: disable sap plugin for bluetooth.service
+      lineinfile:
+        dest: /lib/systemd/system/bluetooth.service
+        regexp: '^ExecStart=/usr/lib/bluetooth/bluetoothd$'
+        line: 'ExecStart=/usr/lib/bluetooth/bluetoothd --noplugin=sap'
+        state: present
+
+    - name: configure dphys-swapfile
+      lineinfile:
+        path: /etc/dphys-swapfile
+        regexp: "^CONF_SWAPSIZE=.*$"
+        line: "CONF_SWAPSIZE=2048"
+
+    - name: install packages
+      apt:
+        name: "{{ packages.apt.install }}"
+        state: present
+        update_cache: yes
+        install_recommends: false
+
+    - name: Create custom plugin directory
+      file:
+        path: /usr/local/share/pwnagotchi/custom-plugins/
+        state: directory
+
+    - name: Create custom config directory
+      file:
+        path: /etc/pwnagotchi/conf.d/
+        state: directory
+
+    - name: clone pwnagotchi repository
+      git:
+        repo: https://github.com/jayofelony/pwnagotchi.git
+        dest: /usr/local/src/pwnagotchi
+      register: pwnagotchigit
+
+    - name: build pwnagotchi wheel
+      command: "python3 setup.py sdist bdist_wheel"
+      args:
+        chdir: /usr/local/src/pwnagotchi
+      when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
+
+    - name: install pwnagotchi wheel and dependencies
+      pip:
+        name: "{{ lookup('fileglob', '/usr/local/src/pwnagotchi/dist/pwnagotchi*.whl') }}"
+        extra_args: "--no-cache-dir"
+      when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
+
+    - name: remove pwnagotchi folder
+      file:
+        state: absent
+        path: /usr/local/src/pwnagotchi
+
+    - name: create /usr/local/share/pwnagotchi/ folder
+      file:
+        path: /usr/local/share/pwnagotchi/
+        state: directory
+
+    #- name: Install go-1.21
+    #  unarchive:
+    #    src: https://go.dev/dl/go1.21.3.linux-arm64.tar.gz
+    #    dest: /usr/local
+    #    remote_src: yes
+    #  register: golang
+
+    #- name: Update .bashrc for go-1.21
+    #  blockinfile:
+    #    dest: /home/pi/.bashrc
+    #    state: present
+    #    block: |
+    #      export GOPATH=$HOME/go
+    #      export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin
+    #  when: golang.changed
+
+    #- name: download pwngrid 1.10.4
+    #  git:
+    #    repo: https://github.com/jayofelony/pwngrid.git
+    #    dest: /usr/local/src/pwngrid
+    #  register: pwngrid
+
+    #- name: install pwngrid 1.10.4
+    #  shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && go mod tidy && make && make install"
+    #  args:
+    #    executable: /bin/bash
+    #    chdir: /usr/local/src/pwngrid
+    #  when: pwngrid.changed
+
+    #- name: remove pwngrid folder
+    #  file:
+    #    state: absent
+    #    path: /usr/local/src/pwngrid
+
+    #- name: download bettercap v2.32.1
+    #  git:
+    #    repo: https://github.com/jayofelony/bettercap.git
+    #    dest: /usr/local/src/bettercap
+    #  register: bettercap
+
+    #- name: Install bettercap v2.32.1
+    #  shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && go mod tidy && make && make install"
+    #  args:
+    #    executable: /bin/bash
+    #   chdir: /usr/local/src/bettercap
+    #  when: bettercap.changed
+
+    #- name: remove bettercap folder
+    #  file:
+    #    state: absent
+    #    path: /usr/local/src/bettercap
+
+    - name: clone bettercap caplets
+      git:
+        repo: https://github.com/jayofelony/caplets.git
+        dest: /tmp/caplets
+      register: capletsgit
+
+    - name: install bettercap caplets
+      make:
+        chdir: /tmp/caplets
+        target: install
+      when: capletsgit.changed
+
+    - name: download and install bettercap ui
+      unarchive:
+        src: "{{ packages.bettercap.ui }}"
+        dest: /usr/local/share/bettercap/
+        remote_src: yes
+        mode: 0755
+
+    - name: add HDMI powersave to rc.local
+      blockinfile:
+        path: /etc/rc.local
+        insertbefore: "exit 0"
+        block: |
+          if ! /opt/vc/bin/tvservice -s | egrep 'HDMI|DVI'; then
+            /opt/vc/bin/tvservice -o
+          fi
+
+    - name: create /etc/pwnagotchi folder
+      file:
+        path: /etc/pwnagotchi
+        state: directory
+
+    - name: check if user configuration exists
+      stat:
+        path: /etc/pwnagotchi/config.toml
+      register: user_config
+
+    - name: create /etc/pwnagotchi/config.toml
+      copy:
+        dest: /etc/pwnagotchi/config.toml
+        content: |
+          # Add your configuration overrides on this file any configuration changes done to default.toml will be lost!
+          # Example:
+          # ui.display.enabled = true
+          # ui.display.type = "waveshare_2"
+      when: not user_config.stat.exists
+
+    - name: Delete motd
+      file:
+        state: absent
+        path: /etc/motd
+
+    - name: Delete motd 10-uname
+      file:
+        state: absent
+        path: /etc/update-motd.d/10-uname
+
+    - name: enable ssh on boot
+      file:
+        path: /boot/ssh
+        state: touch
+
+    - name: adjust /boot/config.txt
+      lineinfile:
+        dest: /boot/config.txt
+        insertafter: EOF
+        line: '{{ item }}'
+      with_items: "{{system.boot_options}}"
+
+    - name: adjust /etc/modules
+      lineinfile:
+        dest: /etc/modules
+        insertafter: EOF
+        line: '{{ item }}'
+      with_items: "{{system.modules}}"
+
+    - name: change root partition
+      replace:
+        dest: /boot/cmdline.txt
+        backup: no
+        regexp: "root=PARTUUID=[a-zA-Z0-9\\-]+"
+        replace: "root=/dev/mmcblk0p2"
+
+    - name: configure /boot/cmdline.txt
+      lineinfile:
+        path: /boot/cmdline.txt
+        backrefs: True
+        state: present
+        backup: no
+        regexp: '(.*)$'
+        line: '\1 modules-load=dwc2,g_ether'
+
+    - name: Add pwnlog alias
+      lineinfile:
+        dest: /home/pi/.bashrc
+        line: "\nalias pwnlog='tail -f -n300 /var/log/pwn*.log | sed --unbuffered \"s/,[[:digit:]]\\{3\\}\\]//g\" | cut -d \" \" -f 2-'"
+        insertafter: EOF
+
+    - name: Add pwnver alias
+      lineinfile:
+        dest: /home/pi/.bashrc
+        line: "\nalias pwnver='python3 -c \"import pwnagotchi as p; print(p.__version__)\"'"
+        insertafter: EOF
+
+    - name: download old libpcap packages
+      get_url:
+        url: "https://old.kali.org/kali/pool/main/libp/libpcap/{{ item }}"
+        dest: /usr/local/src/
+      with_items: "{{ packages.apt.downgrade }}"
+
+    - name: install old libpcap packages
+      apt:
+        force: True
+        state: present
+        deb: "/usr/local/src/{{ item }}"
+      with_items: "{{ packages.apt.downgrade }}"
+      register: libpcap
+
+    - name: remove old libpcap files
+      file:
+        path: "/usr/local/src/{{ item }}"
+        state: absent
+      with_items: "{{ packages.apt.downgrade }}"
+
+    - name: add firmware packages to hold
+      dpkg_selections:
+        name: "{{ item }}"
+        selection: hold
+      with_items: "{{ packages.apt.hold }}"
+      when: libpcap.changed
+
+    - name: disable unnecessary services
+      systemd:
+        name: "{{ item }}"
+        state: stopped
+        enabled: no
+      with_items: "{{ services.disable }}"
+
+    - name: enable services
+      systemd:
+        name: "{{ item }}"
+        enabled: true
+        state: stopped
+      with_items: "{{ services.enable }}"
+      register: enabled
+
+    - name: remove unnecessary apt packages
+      apt:
+        name: "{{ packages.apt.remove }}"
+        state: absent
+        purge: yes
+      register: removed
+
+    - name: clean apt cache
+      apt:
+        autoclean: true
+      when: removed.changed
+
+    - name: apt clean
+      shell: "apt-get clean"
+      args:
+        executable: /bin/bash
+
+    - name: remove /root/go folder
+      file:
+        state: absent
+        path: /root/go
+
+    - name: remove /usr/local/go folder
+      file:
+        state: absent
+        path: /usr/local/go
+
+    - name: remove pip cache
+      file:
+        state: absent
+        path: /root/.cache/pip
+
+    - name: remove dependencies that are no longer required
+      apt:
+        autoremove: yes
+      when: removed.changed
+
+  handlers:
+    - name: reload systemd services
+      systemd:
+        daemon_reload: yes
+      when: enabled.changed
\ No newline at end of file
diff --git a/builder/pwnagotchi.json.pkr.hcl b/builder/pwnagotchi.json.pkr.hcl
index c04b623c..8104ef21 100644
--- a/builder/pwnagotchi.json.pkr.hcl
+++ b/builder/pwnagotchi.json.pkr.hcl
@@ -112,7 +112,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   = "../builder/pwnagotchi.yml"
+    playbook_file   = "../builder/raspberrypi.yml"
   }
 }
 
@@ -157,6 +157,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   = "../builder/pwnagotchi.yml"
+    playbook_file   = "../builder/orangepi.yml"
   }
 }
\ No newline at end of file
diff --git a/builder/pwnagotchi.yml b/builder/raspberrypi.yml
similarity index 100%
rename from builder/pwnagotchi.yml
rename to builder/raspberrypi.yml