diff --git a/builder/orangepi.yml b/builder/orangepi.yml
index f6a0062c..dc468ca0 100644
--- a/builder/orangepi.yml
+++ b/builder/orangepi.yml
@@ -32,8 +32,11 @@
         - apt-daily-upgrade.timer
         - apt-daily.service
         - apt-daily.timer
+        - avahi-daemon.service
+        - avahi-daemon.socket
         - bluetooth.service
         - ifup@wlan0.service
+        - rpi-eeprom-update.service
         - triggerhappy.service
         - wpa_supplicant.service
     packages:
@@ -58,8 +61,9 @@
           - libpcap0.8
           - libpcap0.8-dev
         remove:
+          - avahi-daemon
           - nfs-common
-          - raspberrypi-net-mods
+          - rpi-eeprom
           - triggerhappy
           - wpasupplicant
         install: