diff --git a/zzz_draft_birdnet-pi/Dockerfile b/zzz_draft_birdnet-pi/Dockerfile
index 31e0724cd..ee61576bd 100644
--- a/zzz_draft_birdnet-pi/Dockerfile
+++ b/zzz_draft_birdnet-pi/Dockerfile
@@ -33,6 +33,10 @@ RUN \
     echo "Install dependencies" && \
     apt-get update -y && apt-get install curl gcc python3-dev git jq sudo -y && \
     \
+    # Correct for systemctl
+    curl -f -L -s -S https://raw.githubusercontent.com/gdraheim/docker-systemctl-replacement/master/files/docker/systemctl3.py -o /bin/systemctl && \
+    chmod a+x /bin/systemctl && \
+    \
     # Change user to pi and create /home/pi
     echo "setting users" && \
     groupmod -o -g 101 abc && usermod -o -u 101 abc && \
@@ -49,19 +53,28 @@ RUN \
     curl -f -L -s -S "https://raw.githubusercontent.com/Nachtzuster/BirdNET-Pi/main/newinstaller.sh" -o /newinstaller.sh && \
     chmod 777 /newinstaller.sh && \
     \
+    # Use installer to modify other scripts
+    #######################################
+    # Define file
+    sed -i "1a /./newinstallermod.sh && rm /newinstallermod.sh" /newinstaller.sh && \
+    echo '#!/bin/bash' >> /newinstallermod.sh && \
+    # Remove all instances of sudo from all other scripts
+    echo 'for file in $(grep -srl "sudo" $HOME/BirdNET-Pi/scripts); do sed -i "s|sudo ||" "$file"; done' >> /newinstallermod.sh && \
+    echo 'for file in $(grep -srl "my_dir" $HOME/BirdNET-Pi/scripts); do sed -i "s|\$my_dir|/config|" "$file"; done' >> /newinstallermod.sh && \
+    echo 'for file in $(grep -srl "install_services.sh" $HOME/BirdNET-Pi/scripts); do sed -i "/install_services.sh/c ./install_services.sh" "$file"; done' >> /newinstallermod.sh && \
+    # Disable pulseaudio
+    echo 'for file in $(grep -srl "pulseaudio --start" $HOME/BirdNET-Pi/scripts); do sed -i "/pulseaudio --start/d" "$file"; done' >> /newinstallermod.sh && \
+    # Set permission
+    chmod +x /newinstallermod.sh && \
+    \
     # Modify installer
+    ##################
     # Avoid rebooting at end of installation
     sed -i "/reboot/d" /newinstaller.sh && \
     # Use apt-get as without user action
     sed -i "s|apt |apt-get |g" /newinstaller.sh && \
     # Remove all instances of sudo from the newinstaller
     sed -i -e "s|== 0|== 7|g" -e "s|sudo -n true|true|g" -e "s|sudo -K|true|g" /newinstaller.sh && \
-    # Remove all instances of sudo from all other scripts
-    sed -i '1a for file in $(grep -srl "sudo" $HOME/BirdNET-Pi/scripts); do sed -i "s|sudo ||" "$file"; done' /newinstaller.sh && \
-    sed -i '1a for file in $(grep -srl "my_dir" $HOME/BirdNET-Pi/scripts); do sed -i "s|\$my_dir|/config|" "$file"; done' /newinstaller.sh && \
-    sed -i '1a for file in $(grep -srl "install_services.sh" $HOME/BirdNET-Pi/scripts); do sed -i "/install_services.sh/c ./install_services.sh" "$file"; done' /newinstaller.sh && \
-    # Avoid systemctl
-    sed -i '/git clone/a sed -i "s|systemctl enable|#systemctl enable|g" "$HOME"/BirdNET-Pi/scripts/install_services.sh' /newinstaller.sh && \
     \
     # Execute installer
     /./newinstaller.sh && \
@@ -82,15 +95,15 @@ RUN \
 #    sudo chown -R pi:pi /app && \
 #    /./newinstaller.sh
 #USER root
-    #sudo -E -u birdnet -s /bin/bash -c "/newinstaller.sh"
-    # Correct script
-    #sed -i "s|== 0|== 7|g" /newinstaller.sh && \
-    #sed -i "s|sudo -n true|true|g" /newinstaller.sh && \
-    #sed -i "s|sudo -K|true|g" /newinstaller.sh && \
-    #for file in $(grep -srl "sudo" $HOME/BirdNET-Pi/scripts); do \sed -i "s|sudo ||" "$file"; done && \
-    #/./newinstaller.sh
-    # Correct for absence of sudo
-    #sudo -E -u birdnet -s /bin/bash -c "/newinstaller.sh"
+#sudo -E -u birdnet -s /bin/bash -c "/newinstaller.sh"
+# Correct script
+#sed -i "s|== 0|== 7|g" /newinstaller.sh && \
+#sed -i "s|sudo -n true|true|g" /newinstaller.sh && \
+#sed -i "s|sudo -K|true|g" /newinstaller.sh && \
+#for file in $(grep -srl "sudo" $HOME/BirdNET-Pi/scripts); do \sed -i "s|sudo ||" "$file"; done && \
+#/./newinstaller.sh
+# Correct for absence of sudo
+#sudo -E -u birdnet -s /bin/bash -c "/newinstaller.sh"
 
 ##################
 # 2 Modify Image #
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_birdnet_analysis b/zzz_draft_birdnet-pi/archive/01_birdnet_analysis
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/01_birdnet_analysis
rename to zzz_draft_birdnet-pi/archive/01_birdnet_analysis
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_birdnet_log b/zzz_draft_birdnet-pi/archive/01_birdnet_log
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/01_birdnet_log
rename to zzz_draft_birdnet-pi/archive/01_birdnet_log
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_birdnet_stats b/zzz_draft_birdnet-pi/archive/01_birdnet_stats
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/01_birdnet_stats
rename to zzz_draft_birdnet-pi/archive/01_birdnet_stats
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_chart_viewer b/zzz_draft_birdnet-pi/archive/01_chart_viewer
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/01_chart_viewer
rename to zzz_draft_birdnet-pi/archive/01_chart_viewer
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_getty b/zzz_draft_birdnet-pi/archive/01_getty
similarity index 61%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/01_getty
rename to zzz_draft_birdnet-pi/archive/01_getty
index 97538d6c6..99cafa025 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_getty
+++ b/zzz_draft_birdnet-pi/archive/01_getty
@@ -5,5 +5,4 @@ until [[ -e /var/run/dbus/system_bus_socket ]]; do
 done
 
 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/01_spectrogram_viewer b/zzz_draft_birdnet-pi/archive/01_spectrogram_viewer
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/01_spectrogram_viewer
rename to zzz_draft_birdnet-pi/archive/01_spectrogram_viewer
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/01_web_terminal b/zzz_draft_birdnet-pi/archive/01_web_terminal
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/01_web_terminal
rename to zzz_draft_birdnet-pi/archive/01_web_terminal
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/99_birdnet_recording b/zzz_draft_birdnet-pi/archive/99_birdnet_recording
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/99_birdnet_recording
rename to zzz_draft_birdnet-pi/archive/99_birdnet_recording
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/99_livestream b/zzz_draft_birdnet-pi/archive/99_livestream
similarity index 100%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/99_livestream
rename to zzz_draft_birdnet-pi/archive/99_livestream
diff --git a/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_dbus b/zzz_draft_birdnet-pi/archive/99_pulseaudio
similarity index 71%
rename from zzz_draft_birdnet-pi/rootfs/custom-services.d/00_dbus
rename to zzz_draft_birdnet-pi/archive/99_pulseaudio
index c2f9ad021..6ceab3924 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/00_dbus
+++ b/zzz_draft_birdnet-pi/archive/99_pulseaudio
@@ -1,6 +1,7 @@
 #!/usr/bin/with-contenv bashio
-# Waiting for dbus
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
+#Disable pulseaudio as managed by HA
+echo "Starting service: livestream"
+until [[ -e /start ]]; do
     sleep 1s
 done
 
diff --git a/zzz_draft_birdnet-pi/config.json b/zzz_draft_birdnet-pi/config.json
index 5bc8e68fc..0fa1f7892 100644
--- a/zzz_draft_birdnet-pi/config.json
+++ b/zzz_draft_birdnet-pi/config.json
@@ -57,11 +57,12 @@
     "/dev/nvme1",
     "/dev/nvme2"
   ],
-  "description": "Realtime BirdNET soundscape analyzer",
+  "description": "realtime acoustic bird classification system",
   "environment": {
   },
-  "image": "ghcr.io/alexbelgium/birdnet-pi-{arch}",
   "init": false,
+  "ingress": true,
+  "ingress_stream": true,
   "map": [
     "addon_config:rw",
     "media:rw",
@@ -76,10 +77,7 @@
     "80/tcp": 80
   },
   "ports_description": {
-    "80/tcp": "web ui",
-    "8888/tcp": "web terminal",
-    "8080/tcp": "log",
-    "8501/tcp": "streamlit"
+    "80/tcp": "web ui"
   },
   "privileged": [
     "SYS_ADMIN",
@@ -97,6 +95,6 @@
   },
   "slug": "birdnet-pi",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi",
-  "version": "1.5",
+  "version": "1.8",
   "video": true
 }
diff --git a/zzz_draft_birdnet-pi/rootfs/Caddyfile b/zzz_draft_birdnet-pi/rootfs/Caddyfile
new file mode 100644
index 000000000..95db3a6a5
--- /dev/null
+++ b/zzz_draft_birdnet-pi/rootfs/Caddyfile
@@ -0,0 +1,22 @@
+%%interface%%:%%port%% {
+    reverse_proxy http://localhost:8080 {
+        header_up Host {host}
+        header_up X-Forwarded-For {remote}
+        header_up Connection "upgrade"
+        header_up Accept-Encoding ""
+        @base_url {
+            path /
+            file {
+                try_files {path} /%%ingress_entry%%
+            }
+        }
+        handle @base_url {
+            sub_filter_once off
+            sub_filter_types *
+            sub_filter href=\"/ href=\"%%ingress_entry%%/
+            sub_filter src=\"/ src=\"%%ingress_entry%%/
+            sub_filter hx-get=\"/ hx-get=\"%%ingress_entry%%/
+            sub_filter action=\"/ action=\"%%ingress_entry%%/
+        }
+    }
+}
\ No newline at end of file
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 c49bf2d72..3a5b2c3db 100644
--- a/zzz_draft_birdnet-pi/rootfs/custom-services.d/02_caddy
+++ b/zzz_draft_birdnet-pi/rootfs/custom-services.d/02_caddy
@@ -1,8 +1,9 @@
 #!/usr/bin/with-contenv bashio
 # Dependencies
-sockfile="$(find /run/php -name *.sock)"
+sockfile="empty"
 until [[ -e /var/run/dbus/system_bus_socket ]] && [[ -e "$sockfile" ]]; do
     sleep 1s
+    sockfile="$(find /run/php -name *.sock)"
 done
 
 # Correct fpm.sock
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/cont-init.d/31-ingress.sh b/zzz_draft_birdnet-pi/rootfs/etc/cont-init.d/31-ingress.sh
new file mode 100644
index 000000000..acb3f3231
--- /dev/null
+++ b/zzz_draft_birdnet-pi/rootfs/etc/cont-init.d/31-ingress.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+set -e
+
+#################
+# NGINX SETTING #
+#################
+
+declare ingress_interface
+declare ingress_port
+
+bashio::log.info "Setting up ingress"
+
+echo "... adding new instructions"
+cat /Caddyfile >> /etc/caddy/Caddyfile
+rm /Caddyfile
+
+echo "... customizing"
+ingress_port=$(bashio::addon.ingress_port)
+ingress_interface=$(bashio::addon.ip_address)
+ingress_entry=$(bashio::addon.ingress_entry)
+sed -i "s/%%port%%/${ingress_port}/g" /etc/caddy/Caddyfile
+sed -i "s/%%interface%%/${ingress_interface}/g" /etc/caddy/Caddyfile
+sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/caddy/Caddyfile
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/cont-init.d/99-run.sh b/zzz_draft_birdnet-pi/rootfs/etc/cont-init.d/99-run.sh
index 82326914c..9c7801880 100755
--- a/zzz_draft_birdnet-pi/rootfs/etc/cont-init.d/99-run.sh
+++ b/zzz_draft_birdnet-pi/rootfs/etc/cont-init.d/99-run.sh
@@ -7,18 +7,29 @@ set -e
 #################
 
 # Starting dbus
-echo "Starting service: dbus"
+bashio::log.info "Starting system services..."
+echo "... dbus"
 service dbus start
 
-bashio::log.info "ALSA_CARD option is set to $(bashio::config "ALSA_CARD"). If the microphone doesn't work, please adapt it"
-echo " "
+# Starting php service
+echo "... php"
+until [[ -e /var/run/dbus/system_bus_socket ]]; do
+    sleep 1s
+done
+systemctl start php*service
 
-########################
-# CONFIGURE birdnet-pi #
-########################
-
-bashio::log.info "Starting app..."
+# Starting avahi service
+echo "... avahi"
+systemctl start avahi*service
 
+# Restarting all services
+bashio::log.info "Ensuring birdnet.conf is in /config ; please customize as needed"
 if [ ! -f /config/birdnet.conf ]; then
   cp /etc/birdnet/birdnet.conf /config
 fi
+
+bashio::log.info "Starting BirdNET-Pi services"
+chmod +x $HOME/BirdNET-Pi/scripts/restart_services
+/.$HOME/BirdNET-Pi/scripts/restart_services &>/proc/1/fd/1
+
+bashio::log.info "App is accessible from webui"
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/CHANGELOG.md b/zzz_draft_birdnet-pi2/CHANGELOG.md
deleted file mode 100644
index 8014f013f..000000000
--- a/zzz_draft_birdnet-pi2/CHANGELOG.md
+++ /dev/null
@@ -1,24 +0,0 @@
-## 1.4 (26-04-2024)
-- Minor bugs fixed
-## 1.3 (26-04-2024)
-- Minor bugs fixed
-## 1.2 (25-04-2024)
-- Minor bugs fixed
-## 1.0 (25-04-2024)
-- Minor bugs fixed
-## 0.9 (25-04-2024)
-- Minor bugs fixed
-## 0.6 (24-04-2024)
-- Minor bugs fixed
-## 0.7 (24-04-2024)
-- Minor bugs fixed
-## 0.3 (23-04-2024)
-- Minor bugs fixed
-## 0.1 (23-04-2024)
-- Minor bugs fixed
-## 0.2 (23-04-2024)
-- Feat : Allow to define the /clips folder
-- Feat : Allow mounting of SMB and local drives
-
-## 0.5.1 (22-04-2024)
-- Initial build
diff --git a/zzz_draft_birdnet-pi2/Dockerfile b/zzz_draft_birdnet-pi2/Dockerfile
deleted file mode 100644
index 578590cb2..000000000
--- a/zzz_draft_birdnet-pi2/Dockerfile
+++ /dev/null
@@ -1,192 +0,0 @@
-#============================#
-#  ALEXBELGIUM'S DOCKERFILE  #
-#============================#
-#           _.------.
-#       _.-`    ('>.-`"""-.
-# '.--'`       _'`   _ .--.)
-#    -'         '-.-';`   `
-#    ' -      _.'  ``'--.
-#        '---`    .-'""`
-#               /`
-#=== Home Assistant Addon ===#
-
-#################
-# 1 Build Image #
-#################
-
-ARG BUILD_VERSION
-ARG BUILD_FROM
-FROM ${BUILD_FROM}
-
-# Set shell
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND="noninteractive" \
-    BIRDNET_USER="pi" \
-    USER="pi" \
-    PUID=1000 \
-    PGID=1000 \
-    HOME="/home/pi" \
-    XDG_RUNTIME_DIR="/run/user/1000" \
-    PYTHON_VIRTUAL_ENV="/home/pi/BirdNET-Pi/birdnet/bin/python3"
-
-# hadolint ignore=DL3015,SC2016
-RUN \
-    # Install dependencies
-    echo "Install dependencies" && \
-    apt-get update -y && apt-get install curl gcc python3-dev git jq sudo -y && \
-    \
-    # Change user to pi and create /home/pi
-    echo "setting users" && \
-    groupadd --non-unique -g 1000 pi && \
-    useradd --non-unique --uid 1000 --gid 1000 -m pi && \
-    \
-    # Ensure permissions
-    echo "setting permissions" && \
-    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 && \
-    chmod 777 /newinstaller.sh && \
-    \
-    # Modify installer
-    # Avoid rebooting at end of installation
-    sed -i "/reboot/d" /newinstaller.sh && \
-    # Use apt-get as without user action
-    sed -i "s|apt |apt-get |g" /newinstaller.sh && \
-    # Remove all instances of sudo from the newinstaller
-    sed -i -e "s|== 0|== 7|g" -e "s|sudo -n true|true|g" -e "s|sudo -K|true|g" /newinstaller.sh && \
-    # Remove all instances of sudo from all other scripts
-    sed -i '1a for file in $(grep -srl "sudo" $HOME/BirdNET-Pi/scripts); do sed -i "s|sudo ||" "$file"; done' /newinstaller.sh && \
-    sed -i '1a for file in $(grep -srl "my_dir" $HOME/BirdNET-Pi/scripts); do sed -i "s|\$my_dir|/config|" "$file"; done' /newinstaller.sh && \
-    sed -i '1a for file in $(grep -srl "install_services.sh" $HOME/BirdNET-Pi/scripts); do sed -i "/install_services.sh/c ./install_services.sh" "$file"; done' /newinstaller.sh && \
-    # Avoid systemctl
-    sed -i '/git clone/a sed -i "s|systemctl enable|#systemctl enable|g" "$HOME"/BirdNET-Pi/scripts/install_services.sh' /newinstaller.sh && \
-    \
-    # Execute installer
-    /./newinstaller.sh && \
-    \
-    # Adapt for lsio usage of /app
-    if [ -d /app ]; then rm -r /app; fi && \
-    ln -s /home/pi /app && \
-    chown -R 1000:1000 /home/pi /app
-
-#USER pi
-#WORKDIR /app
-#RUN export DEBIAN_FRONTEND noninteractive && \
-#    export BIRDNET_USER="pi" && \
-#    export USER="pi" && \
-#    export HOME="/app" && \
-#    echo "HOME is $HOME" && \
-#    ls -l /app && \
-#    sudo chown -R pi:pi /app && \
-#    /./newinstaller.sh
-#USER root
-    #sudo -E -u birdnet -s /bin/bash -c "/newinstaller.sh"
-    # Correct script
-    #sed -i "s|== 0|== 7|g" /newinstaller.sh && \
-    #sed -i "s|sudo -n true|true|g" /newinstaller.sh && \
-    #sed -i "s|sudo -K|true|g" /newinstaller.sh && \
-    #for file in $(grep -srl "sudo" $HOME/BirdNET-Pi/scripts); do \sed -i "s|sudo ||" "$file"; done && \
-    #/./newinstaller.sh
-    # Correct for absence of sudo
-    #sudo -E -u birdnet -s /bin/bash -c "/newinstaller.sh"
-
-##################
-# 2 Modify Image #
-##################
-
-# Set S6 wait time
-ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0
-
-##################
-# 3 Install apps #
-##################
-
-# Add rootfs
-COPY rootfs/ /
-
-# Uses /bin for compatibility purposes
-# hadolint ignore=DL4005
-RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \
-    if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi
-
-# Modules
-ARG MODULES="00-local_mounts.sh 00-smb_mounts.sh"
-
-# Automatic modules download
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
-RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
-
-# Manual apps
-ENV PACKAGES="alsa-utils libasound2-plugins nginx"
-
-# Automatic apps & bashio
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
-RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
-
-################
-# 4 Entrypoint #
-################
-
-# Add entrypoint
-ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
-
-# Entrypoint modifications
-ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
-RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
-
-# Avoid config.yaml interference
-WORKDIR /config
-#ENTRYPOINT ["/lib/systemd/systemd"]
-#ENTRYPOINT [ "/usr/bin/env" ]
-#CMD [ "/ha_entrypoint.sh" ]
-#SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-############
-# 5 Labels #
-############
-
-ARG BUILD_ARCH
-ARG BUILD_DATE
-ARG BUILD_DESCRIPTION
-ARG BUILD_NAME
-ARG BUILD_REF
-ARG BUILD_REPOSITORY
-ARG BUILD_VERSION
-LABEL \
-    io.hass.name="${BUILD_NAME}" \
-    io.hass.description="${BUILD_DESCRIPTION}" \
-    io.hass.arch="${BUILD_ARCH}" \
-    io.hass.type="addon" \
-    io.hass.version=${BUILD_VERSION} \
-    maintainer="alexbelgium (https://github.com/alexbelgium)" \
-    org.opencontainers.image.title="${BUILD_NAME}" \
-    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
-    org.opencontainers.image.vendor="Home Assistant Add-ons" \
-    org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
-    org.opencontainers.image.licenses="MIT" \
-    org.opencontainers.image.url="https://github.com/alexbelgium" \
-    org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
-    org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
-    org.opencontainers.image.created=${BUILD_DATE} \
-    org.opencontainers.image.revision=${BUILD_REF} \
-    org.opencontainers.image.version=${BUILD_VERSION}
-
-#################
-# 6 Healthcheck #
-#################
-
-ENV HEALTH_PORT="80" \
-    HEALTH_URL=""
-HEALTHCHECK \
-    --interval=5s \
-    --retries=5 \
-    --start-period=30s \
-    --timeout=25s \
-    CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1
diff --git a/zzz_draft_birdnet-pi2/README.md b/zzz_draft_birdnet-pi2/README.md
deleted file mode 100644
index 70bb29f94..000000000
--- a/zzz_draft_birdnet-pi2/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# Home assistant add-on: birdnet-pi
-
-[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
-
-![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fbirdnet-pi%2Fconfig.json)
-![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fbirdnet-pi%2Fconfig.json)
-![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fbirdnet-pi%2Fconfig.json)
-
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade)
-[![GitHub Super-Linter](https://img.shields.io/github/actions/workflow/status/alexbelgium/hassio-addons/weekly-supelinter.yaml?label=Lint%20code%20base)](https://github.com/alexbelgium/hassio-addons/actions/workflows/weekly-supelinter.yaml)
-[![Builder](https://img.shields.io/github/actions/workflow/status/alexbelgium/hassio-addons/onpush_builder.yaml?label=Builder)](https://github.com/alexbelgium/hassio-addons/actions/workflows/onpush_builder.yaml)
-
-[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white
-
-_Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_
-
-[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers)
-
-![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/birdnet-pi/stats.png)
-
-## About
-
----
-
-[birdnet-pi](https://github.com/tphakala/birdnet-pi/tree/main) is an AI solution for continuous avian monitoring and identification developed by @tphakala
-
-This addon is based on their docker image.
-
-## Configuration
-
-Install, then start the addon a first time
-Webui can be found at <http://homeassistant:8080>.
-
-You'll need a microphone : either use one connected to HA or the audio stream of a rstp camera.
-
-Options can be configured through three ways :
-
-- Addon options
-
-```yaml
-ALSA_CARD : number of the card (0 or 1 usually), see https://github.com/tphakala/birdnet-pi/blob/main/doc/installation.md#deciding-alsa_card-value
-TZ: Etc/UTC specify a timezone to use, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
-COMMAND : realtime --rtsp url # allows to provide arguments to birdnet-pi
-```
-
-- Config.yaml
-Additional variables can be configured using the config.yaml file found in /config/db21ed7f_birdnet-pi/config.yaml using the Filebrowser addon
-
-- Config_env.yaml
-Additional environment variables can be configured there
-
-## Installation
-
----
-
-The installation of this add-on is pretty straightforward and not different in comparison to installing any other add-on.
-
-1. Add my add-ons repository to your home assistant instance (in supervisor addons store at top right, or click button below if you have configured my HA)
-   [![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Falexbelgium%2Fhassio-addons)
-1. Install this add-on.
-1. Click the `Save` button to store your configuration.
-1. Set the add-on options to your preferences
-1. Start the add-on.
-1. Check the logs of the add-on to see if everything went well.
-1. Open the webUI and adapt the software options
-
-## Integration with HA
-
-Not yet available
-
-## Common issues
-
-Not yet available
-
-## Support
-
-Create an issue on github
-
----
-
-![illustration](https://raw.githubusercontent.com/tphakala/birdnet-pi/main/doc/birdnet-pi-dashboard.webp)
diff --git a/zzz_draft_birdnet-pi2/apparmor.txt b/zzz_draft_birdnet-pi2/apparmor.txt
deleted file mode 100644
index 8fcd2487c..000000000
--- a/zzz_draft_birdnet-pi2/apparmor.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <tunables/global>
-
-profile birdnet-pi_addon flags=(attach_disconnected,mediate_deleted) {
-  #include <abstractions/base>
-
-  capability,
-  file,
-  signal,
-  mount,
-  umount,
-  remount,
-  network udp,
-  network tcp,
-  network dgram,
-  network stream,
-  network inet,
-  network inet6,
-  network netlink raw,
-  network unix dgram,
-
-  capability setgid,
-  capability setuid,
-  capability sys_admin,
-  capability dac_read_search,
-  # capability dac_override,
-  # capability sys_rawio,
-
-# S6-Overlay
-  /init ix,
-  /run/{s6,s6-rc*,service}/** ix,
-  /package/** ix,
-  /command/** ix,
-  /run/{,**} rwk,
-  /dev/tty rw,
-  /bin/** ix,
-  /usr/bin/** ix,
-  /usr/lib/bashio/** ix,
-  /etc/s6/** rix,
-  /run/s6/** rix,
-  /etc/services.d/** rwix,
-  /etc/cont-init.d/** rwix,
-  /etc/cont-finish.d/** rwix,
-  /init rix,
-  /var/run/** mrwkl,
-  /var/run/ mrwkl,
-  /dev/i2c-1 mrwkl,
-  # Files required
-  /dev/fuse mrwkl,
-  /dev/sda1 mrwkl,
-  /dev/sdb1 mrwkl,
-  /dev/nvme0 mrwkl,
-  /dev/nvme1 mrwkl,
-  /dev/mmcblk0p1 mrwkl,
-  /dev/* mrwkl,
-  /tmp/** mrkwl,
-
-  # Data access
-  /data/** rw,
-
-  # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
-  ptrace (trace,read) peer=docker-default,
-
-  # docker daemon confinement requires explict allow rule for signal
-  signal (receive) set=(kill,term) peer=/usr/bin/docker,
-
-}
diff --git a/zzz_draft_birdnet-pi2/archive/01_avahi-alias b/zzz_draft_birdnet-pi2/archive/01_avahi-alias
deleted file mode 100644
index 8c45399cb..000000000
--- a/zzz_draft_birdnet-pi2/archive/01_avahi-alias
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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)"
diff --git a/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/finish b/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/finish
deleted file mode 100644
index 21d68ab7d..000000000
--- a/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 3 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-custom_recording
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/run b/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/run
deleted file mode 100644
index f0ee17e1f..000000000
--- a/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-s6-envdir /run/user/1000
-s6-setuidgid ${USER}
-/usr/local/bin/custom_recording.sh
diff --git a/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/type b/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/finish
deleted file mode 100644
index 8cc9f174a..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 3 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-avahi_alias
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/run
deleted file mode 100644
index db31f0635..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bashio
-s6-setuidgid ${USER}
-
-echo "Starting service: avahi alias"
-/bin/bash -c "/usr/bin/avahi-publish -a -R %I $(hostname -I |cut -d' ' -f1)"
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/finish
deleted file mode 100644
index 3b4822906..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 3 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_analysis
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/run
deleted file mode 100644
index f94745e94..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: birdnet analysis"
-
-exec \
-    s6-setuidgid "$USER" "$PYTHON_VIRTUAL_ENV /usr/local/bin/birdnet_analysis.py"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/finish
deleted file mode 100644
index 403b846e3..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 3 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_log
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/run
deleted file mode 100644
index 71db2064b..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/finish
deleted file mode 100644
index fc166d388..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 6 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_recording
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/run
deleted file mode 100644
index 198251faa..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: birdnet recording"
-exec \
-    s6-setuidgid "$USER" "/usr/local/bin/birdnet_recording.sh"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/finish
deleted file mode 100644
index 1e94b56f5..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 5 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_stats
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/run
deleted file mode 100644
index 9b8c877ee..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bashio
-s6-setuidgid ${USER}
-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'"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/finish
deleted file mode 100644
index 8adf28b5d..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 3 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-caddy
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/run
deleted file mode 100644
index e8d2444fa..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: caddy"
-exec \
-    s6-setuidgid "$USER" "/usr/local/bin/caddy run --config /etc/caddy/Caddyfile"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/finish
deleted file mode 100644
index f616f39ee..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 120 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-chart_viewer
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/run
deleted file mode 100644
index 0e9a0310e..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/finish
deleted file mode 100644
index e1ed061fe..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 3 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-getty
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/run
deleted file mode 100644
index 1ebeecb91..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: getty"
-exec \
-    s6-setuidgid "$USER" "/sbin/agetty --autologin ${USER} --noclear %I $TERM"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/finish
deleted file mode 100644
index 9e7d0f1b4..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 3 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-livestream
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/run
deleted file mode 100644
index 931cf054b..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: livestream"
-exec \
-    s6-setuidgid "$USER" "/usr/local/bin/livestream.sh"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/finish
deleted file mode 100644
index 1ee0d4542..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 10 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/run
deleted file mode 100644
index bc7951ee6..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: spectrogram viewer"
-exec \
-    s6-setuidgid "$USER" "/usr/local/bin/spectrogram.sh"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/dependencies.d/init-services
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/finish b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/finish
deleted file mode 100644
index fe91824a9..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if { sleep 3 }
-s6-svc -u /etc/s6-overlay/s6-rc.d/svc-web_terminal
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/run b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/run
deleted file mode 100644
index 495499d65..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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"
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/type b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-avahi-alias b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-avahi-alias
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-birdnet_analysis b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-birdnet_analysis
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-birdnet_log b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-birdnet_log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-birdnet_recording b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-birdnet_recording
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-birdnet_stats b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-birdnet_stats
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-caddy b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-caddy
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-chart_viewer b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-chart_viewer
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-getty b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-getty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-livestream b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-livestream
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-spectrogram_viewer b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-spectrogram_viewer
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-web_terminal b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/user/contents.d/svc-web_terminal
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zzz_draft_birdnet-pi2/build.yaml b/zzz_draft_birdnet-pi2/build.yaml
deleted file mode 100644
index ce1998763..000000000
--- a/zzz_draft_birdnet-pi2/build.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-build_from:
-  aarch64: jrei/systemd-debian:12
-  amd64: jrei/systemd-debian:12
-codenotary:
-  signer: alexandrep.github@gmail.com
diff --git a/zzz_draft_birdnet-pi2/config.json b/zzz_draft_birdnet-pi2/config.json
deleted file mode 100644
index 523dd4120..000000000
--- a/zzz_draft_birdnet-pi2/config.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "arch": [
-    "aarch64",
-    "amd64"
-  ],
-  "audio": true,
-  "codenotary": "alexandrep.github@gmail.com",
-  "devices": [
-    "/dev/dri",
-    "/dev/dri/card0",
-    "/dev/dri/card1",
-    "/dev/dri/renderD128",
-    "/dev/vchiq",
-    "/dev/video10",
-    "/dev/video11",
-    "/dev/video12",
-    "/dev/video13",
-    "/dev/video14",
-    "/dev/video15",
-    "/dev/video16",
-    "/dev/ttyUSB0",
-    "/dev/sda",
-    "/dev/sdb",
-    "/dev/sdc",
-    "/dev/sdd",
-    "/dev/sde",
-    "/dev/sdf",
-    "/dev/sdg",
-    "/dev/nvme",
-    "/dev/nvme0n1p1",
-    "/dev/nvme0n1p2",
-    "/dev/mmcblk",
-    "/dev/fuse",
-    "/dev/sda1",
-    "/dev/sdb1",
-    "/dev/sdc1",
-    "/dev/sdd1",
-    "/dev/sde1",
-    "/dev/sdf1",
-    "/dev/sdg1",
-    "/dev/sda2",
-    "/dev/sdb2",
-    "/dev/sdc2",
-    "/dev/sdd2",
-    "/dev/sde2",
-    "/dev/sdf2",
-    "/dev/sdg2",
-    "/dev/sda3",
-    "/dev/sdb3",
-    "/dev/sda4",
-    "/dev/sdb4",
-    "/dev/sda5",
-    "/dev/sda6",
-    "/dev/sda7",
-    "/dev/sda8",
-    "/dev/nvme0",
-    "/dev/nvme1",
-    "/dev/nvme2"
-  ],
-  "description": "Realtime BirdNET soundscape analyzer",
-  "environment": {
-  },
-  "image": "ghcr.io/alexbelgium/birdnet-pi2-{arch}",
-  "init": false,
-  "map": [
-    "addon_config:rw",
-    "media:rw",
-    "share:rw"
-  ],
-  "name": "zzz Do not use 2",
-  "options": {
-    "COMMAND": "realtime"
-  },
-  "panel_icon": "mdi:bird",
-  "ports": {
-    "80/tcp": 80
-  },
-  "ports_description": {
-    "80/tcp": "web ui",
-    "8888/tcp": "web terminal",
-    "8080/tcp": "log",
-    "8501/tcp": "streamlit"
-  },
-  "privileged": [
-    "SYS_ADMIN",
-    "DAC_READ_SEARCH"
-  ],
-  "schema": {
-    "ALSA_CARD": "int?",
-    "COMMAND": "str",
-    "TZ": "str?",
-    "cifsdomain": "str?",
-    "cifspassword": "str?",
-    "cifsusername": "str?",
-    "localdisks": "str?",
-    "networkdisks": "str?"
-  },
-  "slug": "birdnet-pi2",
-  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi",
-  "version": "1.2",
-  "video": true
-}
diff --git a/zzz_draft_birdnet-pi2/icon.png b/zzz_draft_birdnet-pi2/icon.png
deleted file mode 100644
index c51003cdd..000000000
Binary files a/zzz_draft_birdnet-pi2/icon.png and /dev/null differ
diff --git a/zzz_draft_birdnet-pi2/logo.png b/zzz_draft_birdnet-pi2/logo.png
deleted file mode 100644
index c51003cdd..000000000
Binary files a/zzz_draft_birdnet-pi2/logo.png and /dev/null differ
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/00_dbus b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/00_dbus
deleted file mode 100644
index c2f9ad021..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/00_dbus
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# Waiting for dbus
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
-    sleep 1s
-done
-
-echo "Starting service: pulseaudio"
-while :
-do
-    if [[ ! $(/usr/bin/pulseaudio --check) ]]; then
-        exec \
-            s6-setuidgid "$USER" /usr/bin/pulseaudio --start
-    fi
-    sleep 10
-done
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/00_php_pfm b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/00_php_pfm
deleted file mode 100644
index 1c9797b59..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/00_php_pfm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# Waiting for dbus
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
-    sleep 1s
-done
-echo "Starting service: php pfm"
-exec /usr/sbin/php-fpm* -F
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_avahi b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_avahi
deleted file mode 100644
index 2ffb3671f..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_avahi
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# Waiting for dbus
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
-    sleep 1s
-done
-
-echo "Starting service: avahi daemon"
-exec \
-    avahi-daemon --no-chroot
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_analysis b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_analysis
deleted file mode 100644
index 98ab084ee..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_analysis
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: birdnet analysis"
-exec \
-    s6-setuidgid "$USER" "$PYTHON_VIRTUAL_ENV" /usr/local/bin/birdnet_analysis.py
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_log b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_log
deleted file mode 100644
index 1f5e8468c..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_log
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_recording b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_recording
deleted file mode 100644
index f7379f36f..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_recording
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: birdnet recording"
-exec \
-    s6-setuidgid "$USER" /usr/local/bin/birdnet_recording.sh
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_stats b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_stats
deleted file mode 100644
index 718c42163..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_stats
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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"
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_chart_viewer b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_chart_viewer
deleted file mode 100644
index 9dab002e4..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_chart_viewer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_getty b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_getty
deleted file mode 100644
index 97538d6c6..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_getty
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: getty"
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
-    sleep 1s
-done
-
-exec \
-    s6-setuidgid "$USER" /sbin/agetty --autologin "${USER}"
-     --noclear %I "$TERM"
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_livestream b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_livestream
deleted file mode 100644
index 4869477e0..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_livestream
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: livestream"
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
-    sleep 1s
-done
-
-exec \
-    s6-setuidgid "$USER" /usr/local/bin/livestream.sh
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_spectrogram_viewer b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_spectrogram_viewer
deleted file mode 100644
index ac2da8db4..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_spectrogram_viewer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bashio
-echo "Starting service: spectrogram viewer"
-exec \
-    s6-setuidgid "$USER" /usr/local/bin/spectrogram.sh
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_web_terminal b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_web_terminal
deleted file mode 100644
index 537f67c34..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_web_terminal
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/02_caddy b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/02_caddy
deleted file mode 100644
index 3bc7a07ff..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/02_caddy
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# Dependencies
-until [[ -e /var/run/dbus/system_bus_socket ]] && [[ -e /run/php/php*-fpm.sock ]]; do
-    sleep 1s
-done
-
-# Correct fpm.sock
-sed -i "s|/run/php/php-fpm.sock|$(find /run/php -name *.sock)|g" /etc/caddy/Caddyfile
-
-echo "Starting service: caddy"
-exec \
-    s6-setuidgid "$USER" /usr/bin/caddy run --config /etc/caddy/Caddyfile
diff --git a/zzz_draft_birdnet-pi2/rootfs/etc/cont-init.d/99-run.sh b/zzz_draft_birdnet-pi2/rootfs/etc/cont-init.d/99-run.sh
deleted file mode 100755
index 82326914c..000000000
--- a/zzz_draft_birdnet-pi2/rootfs/etc/cont-init.d/99-run.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-#################
-# INITALISATION #
-#################
-
-# Starting dbus
-echo "Starting service: dbus"
-service dbus start
-
-bashio::log.info "ALSA_CARD option is set to $(bashio::config "ALSA_CARD"). If the microphone doesn't work, please adapt it"
-echo " "
-
-########################
-# CONFIGURE birdnet-pi #
-########################
-
-bashio::log.info "Starting app..."
-
-if [ ! -f /config/birdnet.conf ]; then
-  cp /etc/birdnet/birdnet.conf /config
-fi
diff --git a/zzz_draft_birdnet-pi2/stats.png b/zzz_draft_birdnet-pi2/stats.png
deleted file mode 100644
index 1904b9682..000000000
Binary files a/zzz_draft_birdnet-pi2/stats.png and /dev/null differ