diff --git a/debian/dump1090-fa.default b/debian/dump1090-fa.default
index 5ecbc85..936c524 100644
--- a/debian/dump1090-fa.default
+++ b/debian/dump1090-fa.default
@@ -2,10 +2,11 @@
 # This is read by the systemd service file as an environment file,
 # and evaluated by some scripts as a POSIX shell fragment.
 
-# TODO: This needs to be generated from piaware-config.txt
+# If you are using a PiAware sdcard image, this config file is regenerated
+# on boot based on the contents of piaware-config.txt; any changes made to this
+# file will be lost.
 
-#RECEIVER_OPTIONS="--device-index 0 --gain -10 --ppm 0 --net-bo-port 30005 --fix"
-RECEIVER_OPTIONS="--net-only --net-bo-port 0"
+RECEIVER_OPTIONS="--device-index 0 --gain -10 --ppm 0 --net-bo-port 30005"
 DECODER_OPTIONS="--max-range 300"
-NET_OPTIONS="--net --net-heartbeat 60 --net-ro-size 1000 --net-ro-interval 1 --net-http-port 0 --net-ri-port 0 --net-ro-port 30002 --net-sbs-port 30003 --net-bi-port 30104 --net-fatsv-port 0"
+NET_OPTIONS="--net --net-heartbeat 60 --net-ro-size 1000 --net-ro-interval 1 --net-http-port 0 --net-ri-port 0 --net-ro-port 30002 --net-sbs-port 30003 --net-bi-port 30004,30104 --net-bo-port 30005"
 JSON_OPTIONS="--json-location-accuracy 1"