diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index f6d1128..9adee94 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -182,6 +182,9 @@
       chdir: /tmp/caplets
       target: install
 
+  - name: install bettercap http ui
+    command: "/usr/bin/bettercap -eval 'caplets.update; ui.update; q'"
+
   - name: create cpuusage script
     copy:
       dest: /usr/bin/cpuusage
@@ -239,6 +242,26 @@
           /usr/local/bin/pwnagotchi
         fi
 
+  - name: create bettercap-launcher script
+    copy:
+      dest: /usr/bin/bettercap-launcher
+      mode: 0755
+      content: |
+        #!/usr/bin/env bash
+        # blink 10 times to signal ready state
+        /usr/bin/bootblink 10 &
+        if ifconfig | grep usb0 | grep RUNNING; then
+          # if override file exists, go into auto mode
+          if [ -f /root/.pwnagotchi-auto ]; then
+            rm /root/.pwnagotchi-auto
+            /usr/bin/bettercap -no-colors -caplet pwnagotchi-auto
+          else
+            /usr/bin/bettercap -no-colors -caplet pwnagotchi-manual
+          fi
+        else
+          /usr/bin/bettercap -no-colors -caplet pwnagotchi-auto
+        fi
+
   - name: create monstart script
     copy:
       dest: /usr/bin/monstart
@@ -379,7 +402,7 @@
         [Service]
         Type=simple
         PermissionsStartOnly=true
-        ExecStart=/usr/bin/bettercap -no-colors -caplet pwnagotchi
+        ExecStart=/usr/local/bin/bettercap-launcher
         Restart=always
         RestartSec=30