diff --git a/debian/autoradio-server.radiod.service b/debian/autoradio-server.radiod.service
index 8d0f732e3c648188b9ccccfb27a38e05557f2bd3..c7cec49bae7d1266cd3705541e4e3a7857c406dd 100644
--- a/debian/autoradio-server.radiod.service
+++ b/debian/autoradio-server.radiod.service
@@ -6,10 +6,11 @@ Wants=etcd.service
 [Service]
 User=icecast2
 EnvironmentFile=-/etc/default/autoradio
-ExecStart=/usr/bin/radiod $ETCD_SERVER $PUBLIC_IP $INTERFACE $RADIOD_OPTIONS
+ExecStart=/usr/bin/radiod $ETCD_OPTIONS $RADIOD_OPTIONS
 Restart=always
 RestartSec=1
 LimitNOFILE=65535
+AmbientCapabilities=CAP_NET_BIND_SERVICE
 
 [Install]
 WantedBy=multi-user.target
diff --git a/debian/autoradio.default b/debian/autoradio.default
index 872e76a43b2545074743b434f8373d868925133b..ef772fc32474821c30f4e0dde62cb134762fa2bd 100644
--- a/debian/autoradio.default
+++ b/debian/autoradio.default
@@ -1,17 +1,8 @@
 
-# Set your base domain name here.
-#DOMAIN="--domain="
-
-# Set your public IP if necessary (specify multiple times for v4/v6).
-#PUBLIC_IP="--public-ip="
-
-# Set the IP address that is advertised to peers.
-PEER_IP="--peer-ip="
-
 # Set the etcd servers to connect to (default: localhost:2379).
-ETCD_SERVER="--etcd=http://localhost:2379"
+ETCD_OPTIONS="--etcd=http://localhost:2379"
 
 # Additional options that are passed to specific daemons.
-#RADIOD_OPTIONS="--bwlimit=1000"
-#RADIOD_OPTIONS="--interface=eth0"
-RADIOD_OPTIONS=""
+#RADIOD_OPTIONS="--domain= --public-ip= --peer-ip="
+RADIOD_OPTIONS=
+TRANSCODERD_OPTIONS=