diff --git a/zzz_draft_birdnet-pi/Dockerfile b/zzz_draft_birdnet-pi/Dockerfile
index e05201af4..e55f43e06 100644
--- a/zzz_draft_birdnet-pi/Dockerfile
+++ b/zzz_draft_birdnet-pi/Dockerfile
@@ -41,8 +41,9 @@ RUN \
     \
     # Ensure permissions
     echo "setting permissions" && \
-    chown -R 1000:1000 /home/pi && \
     echo "pi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
+    mkdir -p /home/pi/.config/matplotlib && \
+    chown -R 1000:1000 /home/pi && \
     \
     # Download installer
     curl -f -L -s -S "https://raw.githubusercontent.com/Nachtzuster/BirdNET-Pi/main/newinstaller.sh" -o /newinstaller.sh && \
diff --git a/zzz_draft_birdnet-pi/config.json b/zzz_draft_birdnet-pi/config.json
index df15808c7..cf2e657d6 100644
--- a/zzz_draft_birdnet-pi/config.json
+++ b/zzz_draft_birdnet-pi/config.json
@@ -76,7 +76,10 @@
     "80/tcp": 80
   },
   "ports_description": {
-    "80/tcp": "web ui"
+    "80/tcp": "web ui",
+    "8888/tcp": "web terminal",
+    "8080/tcp": "log",
+    "8501/tcp": "streamlit"
   },
   "privileged": [
     "SYS_ADMIN",
@@ -94,5 +97,5 @@
   },
   "slug": "birdnet-pi",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi",
-  "version": "1.0"
+  "version": "1.1"
 }
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_analysis b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_birdnet_analysis
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_analysis
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/00_birdnet_analysis
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_log b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_birdnet_log
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_log
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/00_birdnet_log
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_recording b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_birdnet_recording
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_recording
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/00_birdnet_recording
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_stats b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_birdnet_stats
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_stats
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/00_birdnet_stats
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/chart_viewer b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_chart_viewer
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/chart_viewer
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/00_chart_viewer
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_dbus b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_dbus
index 659c9c148..e783de5a3 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_dbus
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_dbus
@@ -1,3 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: dbus"
-dbus-daemon --system
\ No newline at end of file
+exec \
+    dbus-daemon --system --nofork
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_php_pfm b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_php_pfm
new file mode 100644
index 000000000..5735014c7
--- /dev/null
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_php_pfm
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+exec /usr/sbin/php-fpm* -F
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_pulseaudio b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_pulseaudio
new file mode 100644
index 000000000..5998aebb8
--- /dev/null
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_pulseaudio
@@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bashio
+echo "Starting service: pulseaudio"
+exec s6-setuidgid abc \
+  /usr/bin/pulseaudio \
+    --log-level=0 \
+    --log-target=stderr \
+    --exit-idle-time=-1 > /dev/null 2>&1
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/spectrogram_viewer b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_spectrogram_viewer
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/spectrogram_viewer
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/00_spectrogram_viewer
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/web_terminal b/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_web_terminal
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/web_terminal
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/00_web_terminal
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_avahi b/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_avahi
index d0ad8ba46..156460c6b 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_avahi
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_avahi
@@ -1,3 +1,8 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: avahi daemon"
-avahi-daemon
\ No newline at end of file
+until [[ -e /var/run/dbus/system_bus_socket ]]; do
+    sleep 1s
+done
+
+exec \
+    avahi-daemon --no-chroot
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/caddy b/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_caddy
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/caddy
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/01_caddy
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/getty b/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_getty
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/getty
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/01_getty
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/livestream b/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_livestream
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/livestream
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/01_livestream
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/avahi-alias b/zzz_draft_birdnet-pi/rootfs/custom-services.e/01_avahi-alias
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/avahi-alias
rename to zzz_draft_birdnet-pi/rootfs/custom-services.e/01_avahi-alias