diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/02_caddy b/zzz_draft_birdnet-pi/rootfs/custom-services.d/02_caddy
index 3bc7a07ff..c49bf2d72 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/02_caddy
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/02_caddy
@@ -1,12 +1,13 @@
 #!/usr/bin/with-contenv bashio
 # Dependencies
-until [[ -e /var/run/dbus/system_bus_socket ]] && [[ -e /run/php/php*-fpm.sock ]]; do
+sockfile="$(find /run/php -name *.sock)"
+until [[ -e /var/run/dbus/system_bus_socket ]] && [[ -e "$sockfile" ]]; do
     sleep 1s
 done
 
 # Correct fpm.sock
-sed -i "s|/run/php/php-fpm.sock|$(find /run/php -name *.sock)|g" /etc/caddy/Caddyfile
+chown caddy:caddy /run/php/php*-fpm.sock
+sed -i "s|/run/php/php-fpm.sock|$sockfile|g" /etc/caddy/Caddyfile
 
 echo "Starting service: caddy"
-exec \
-    s6-setuidgid "$USER" /usr/bin/caddy run --config /etc/caddy/Caddyfile
+/usr/bin/caddy run --config /etc/caddy/Caddyfile
diff --git a/zzz_draft_birdnet-pi/archive/01_avahi-alias b/zzz_draft_birdnet-pi/rootfs/custom-services.d/99_avahi-alias
similarity index 72%
rename from zzz_draft_birdnet-pi/archive/01_avahi-alias
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/99_avahi-alias
index 8c45399cb..0f0b74435 100644
--- a/zzz_draft_birdnet-pi/archive/01_avahi-alias
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/99_avahi-alias
@@ -1,4 +1,8 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: avahi alias"
+until [[ -e /start ]]; do
+    sleep 1s
+done
+
 exec \
-    s6-setuidgid "$USER" /usr/bin/avahi-publish -a -R %I "$(hostname -I |cut -d' ' -f1)"
+    s6-setuidgid "$USER" /usr/bin/avahi-publish -a -R %I "$(hostname)"
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_birdnet_recording b/zzz_draft_birdnet-pi/rootfs/custom-services.d/99_birdnet_recording
similarity index 75%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/01_birdnet_recording
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/99_birdnet_recording
index f7379f36f..4df43cf10 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_birdnet_recording
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/99_birdnet_recording
@@ -1,4 +1,9 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: birdnet recording"
+
+until [[ -e /start ]]; do
+    sleep 1s
+done
+
 exec \
     s6-setuidgid "$USER" /usr/local/bin/birdnet_recording.sh
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_livestream b/zzz_draft_birdnet-pi/rootfs/custom-services.d/99_livestream
similarity index 74%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/01_livestream
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/99_livestream
index 4869477e0..c5d34e5c9 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_livestream
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/99_livestream
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: livestream"
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
+until [[ -e /start ]]; do
     sleep 1s
 done