diff --git a/zzz_draft_birdnet-pi/config.json b/zzz_draft_birdnet-pi/config.json
index 5c97065cc..df15808c7 100644
--- a/zzz_draft_birdnet-pi/config.json
+++ b/zzz_draft_birdnet-pi/config.json
@@ -94,5 +94,5 @@
   },
   "slug": "birdnet-pi",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi",
-  "version": "0.9"
+  "version": "1.0"
 }
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 87fdd114a..659c9c148 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,3 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: dbus"
-dbus-daemon --system & true
\ No newline at end of file
+dbus-daemon --system
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/avahi b/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_avahi
similarity index 78%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/avahi
rename to zzz_draft_birdnet-pi/rootfs/custom-services.d/01_avahi
index 8401e8a5f..d0ad8ba46 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/avahi
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_avahi
@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: avahi daemon"
-avahi-daemon & true
\ No newline at end of file
+avahi-daemon
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/avahi-alias b/zzz_draft_birdnet-pi/rootfs/custom-services.d/avahi-alias
index da919b6d0..8c45399cb 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/avahi-alias
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/avahi-alias
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: avahi alias"
 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 -I |cut -d' ' -f1)"
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_analysis b/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_analysis
index e33a53003..98ab084ee 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_analysis
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_analysis
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: birdnet analysis"
 exec \
-    s6-setuidgid "$USER" "$PYTHON_VIRTUAL_ENV /usr/local/bin/birdnet_analysis.py"
+    s6-setuidgid "$USER" "$PYTHON_VIRTUAL_ENV" /usr/local/bin/birdnet_analysis.py
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_log b/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_log
index 71db2064b..1f5e8468c 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_log
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_log
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: birdnet log"
 exec \
-    s6-setuidgid "$USER" "/usr/local/bin/gotty --address localhost -p 8080 --path log --title-format 'BirdNET-Pi Log' birdnet_log.sh"
+    s6-setuidgid "$USER" /usr/local/bin/gotty --address localhost -p 8080 --path log --title-format "BirdNET-Pi Log" birdnet_log.sh
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_recording b/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_recording
index 198251faa..f7379f36f 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_recording
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_recording
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: birdnet recording"
 exec \
-    s6-setuidgid "$USER" "/usr/local/bin/birdnet_recording.sh"
+    s6-setuidgid "$USER" /usr/local/bin/birdnet_recording.sh
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_stats b/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_stats
index 79d7c1c2f..718c42163 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_stats
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/birdnet_stats
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: birdnet stats"
 exec \
-    s6-setuidgid "$USER" "$HOME/BirdNET-Pi/birdnet/bin/streamlit run $HOME/BirdNET-Pi/scripts/plotly_streamlit.py --browser.gatherUsageStats false --server.address localhost --server.baseUrlPath '/stats'"
+    s6-setuidgid "$USER" "$HOME"/BirdNET-Pi/birdnet/bin/streamlit run "$HOME"/BirdNET-Pi/scripts/plotly_streamlit.py --browser.gatherUsageStats false --server.address localhost --server.baseUrlPath "/stats"
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/caddy b/zzz_draft_birdnet-pi/rootfs/custom-services.d/caddy
index 7ea04f6bf..42bb83342 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/caddy
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/caddy
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: caddy"
 exec \
-    s6-setuidgid "$USER" "/usr/bin/caddy run --config /etc/caddy/Caddyfile"
+    s6-setuidgid "$USER" /usr/bin/caddy run --config /etc/caddy/Caddyfile
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/chart_viewer b/zzz_draft_birdnet-pi/rootfs/custom-services.d/chart_viewer
index 0e9a0310e..9dab002e4 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/chart_viewer
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/chart_viewer
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: chart viewer"
 exec \
-    s6-setuidgid "$USER" "$PYTHON_VIRTUAL_ENV /usr/local/bin/daily_plot.py --daemon --sleep 2"
+    s6-setuidgid "$USER" "$PYTHON_VIRTUAL_ENV" /usr/local/bin/daily_plot.py --daemon --sleep 2
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/getty b/zzz_draft_birdnet-pi/rootfs/custom-services.d/getty
index 1ebeecb91..d127b26de 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/getty
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/getty
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: getty"
 exec \
-    s6-setuidgid "$USER" "/sbin/agetty --autologin ${USER} --noclear %I $TERM"
+    s6-setuidgid "$USER" /sbin/agetty --autologin "${USER}"
+     --noclear %I "$TERM"
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/livestream b/zzz_draft_birdnet-pi/rootfs/custom-services.d/livestream
index 931cf054b..f2724d399 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/livestream
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/livestream
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: livestream"
 exec \
-    s6-setuidgid "$USER" "/usr/local/bin/livestream.sh"
+    s6-setuidgid "$USER" /usr/local/bin/livestream.sh
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/spectrogram_viewer b/zzz_draft_birdnet-pi/rootfs/custom-services.d/spectrogram_viewer
index bc7951ee6..ac2da8db4 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/spectrogram_viewer
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/spectrogram_viewer
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: spectrogram viewer"
 exec \
-    s6-setuidgid "$USER" "/usr/local/bin/spectrogram.sh"
+    s6-setuidgid "$USER" /usr/local/bin/spectrogram.sh
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/web_terminal b/zzz_draft_birdnet-pi/rootfs/custom-services.d/web_terminal
index 495499d65..537f67c34 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/web_terminal
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/web_terminal
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bashio
 echo "Starting service: web terminal"
 exec \
-    s6-setuidgid "$USER" "/usr/local/bin/gotty --address localhost -w -p 8888 --path terminal --title-format 'BirdNET-Pi Terminal' login"
+    s6-setuidgid "$USER" /usr/local/bin/gotty --address localhost -w -p 8888 --path terminal --title-format "BirdNET-Pi Terminal" login