diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 1bd46ff..e6eba14 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -18,6 +18,7 @@
         - dphys-swapfile.service
         - pwnagotchi.service
         - bettercap.service
+        - pwngrid-peer.service
         - epd-fuse.service
       disable:
         - apt-daily.timer
@@ -32,6 +33,8 @@
       bettercap:
         url: "https://github.com/bettercap/bettercap/releases/download/v2.25/bettercap_linux_armv6l_2.25.zip"
         ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip"
+      pwngrid:
+        url: "https://github.com/evilsocket/pwngrid/releases/download/v1.5.2/pwngrid_linux_armv6l_v1.5.2.zip"
       apt:
         hold:
           - firmware-atheros
@@ -210,6 +213,13 @@
       name: "{{ lookup('fileglob', '/usr/local/src/pwnagotchi/dist/pwnagotchi*.whl') }}"
       extra_args: "--no-cache-dir"
 
+  - name: download and install pwngrid
+    unarchive:
+      src: "{{ packages.pwngrid.url }}"
+      dest: /usr/bin
+      remote_src: yes
+      mode: 0755
+
   - name: download and install bettercap
     unarchive:
       src: "{{ packages.bettercap.url }}"
@@ -479,6 +489,28 @@
     apt:
       autoremove: yes
 
+  - name: add pwngrid-peer service to systemd
+    copy:
+      dest: /etc/systemd/system/pwngrid-peer.service
+      content: |
+        [Unit]
+        Description=pwngrid peer service.
+        Documentation=https://pwnagotchi.ai
+        Wants=network.target
+        After=network.target
+
+        [Service]
+        Type=simple
+        PermissionsStartOnly=true
+        ExecStart=/usr/bin/pwngrid -keys /etc/pwnagotchi -address 127.0.0.1:8666
+        Restart=always
+        RestartSec=30
+
+        [Install]
+        WantedBy=multi-user.target
+    notify:
+      - reload systemd services
+
   - name: add bettercap service to systemd
     copy:
       dest: /etc/systemd/system/bettercap.service