diff --git a/zzz_draft_birdnet-pi2/CHANGELOG.md b/zzz_draft_birdnet-pi2/CHANGELOG.md
new file mode 100644
index 000000000..0d7b27160
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/CHANGELOG.md
@@ -0,0 +1,22 @@
+## 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
new file mode 100644
index 000000000..f6226e98d
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/Dockerfile
@@ -0,0 +1,190 @@
+#============================#
+#  ALEXBELGIUM'S DOCKERFILE  #
+#============================#
+#           _.------.
+#       _.-`    ('>.-`"""-.
+# '.--'`       _'`   _ .--.)
+#    -'         '-.-';`   `
+#    ' -      _.'  ``'--.
+#        '---`    .-'""`
+#               /`
+#=== Home Assistant Addon ===#
+
+#################
+# 1 Build Image #
+#################
+
+ARG BUILD_VERSION
+ARG BUILD_FROM
+FROM ${BUILD_FROM}
+
+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-pi2/birdnet/bin/python3"
+
+# hadolint ignore=DL3015,SC2016
+RUN \
+    # Install dependencies
+    echo "Install dependencies" && \
+    apt-get update -y && apt-get install gcc python3-dev git jq sudo -y && \
+    \
+    # Change user to pi and create /home/pi
+    echo "setting users" && \
+    groupmod -o -g 101 abc && usermod -o -u 101 abc && \
+    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-pi2/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-pi2/scripts); do sed -i "s|sudo ||" "$file"; done' /newinstaller.sh && \
+    sed -i '1a for file in $(grep -srl "my_dir" $HOME/birdnet-pi2/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-pi2/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-pi2/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-pi2/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
new file mode 100644
index 000000000..6da26ed64
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/README.md
@@ -0,0 +1,81 @@
+# Home assistant add-on: birdnet-pi2
+
+[![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-pi2%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-pi2%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-pi2%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-pi2/stats.png)
+
+## About
+
+---
+
+[birdnet-pi2](https://github.com/tphakala/birdnet-pi2/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-pi2/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-pi2
+```
+
+- Config.yaml
+Additional variables can be configured using the config.yaml file found in /config/db21ed7f_birdnet-pi2/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-pi2/main/doc/birdnet-pi2-dashboard.webp)
diff --git a/zzz_draft_birdnet-pi2/apparmor.txt b/zzz_draft_birdnet-pi2/apparmor.txt
new file mode 100644
index 000000000..e8ea8da35
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/apparmor.txt
@@ -0,0 +1,66 @@
+#include <tunables/global>
+
+profile birdnet-pi2_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/disabled_service/svc-custom_recording/dependencies.d/init-services b/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/dependencies.d/init-services
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..21d68ab7d
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..f0ee17e1f
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/run
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/disabled_service/svc-custom_recording/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..8cc9f174a
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..db31f0635
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/run
@@ -0,0 +1,5 @@
+#!/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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-avahi-alias/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..3b4822906
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..f94745e94
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/run
@@ -0,0 +1,5 @@
+#!/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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_analysis/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..403b846e3
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..9fc07e1b8
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/run
@@ -0,0 +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-pi2 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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_log/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..fc166d388
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..198251faa
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/run
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_recording/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..1e94b56f5
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..650003136
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/run
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bashio
+s6-setuidgid ${USER}
+echo "Starting service: birdnet stats"
+exec \
+    s6-setuidgid "$USER" "$HOME/birdnet-pi2/birdnet/bin/streamlit run $HOME/birdnet-pi2/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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-birdnet_stats/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..8adf28b5d
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..e8d2444fa
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/run
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-caddy/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..f616f39ee
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..0e9a0310e
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/run
@@ -0,0 +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"
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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-chart_viewer/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e1ed061fe
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..1ebeecb91
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/run
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-getty/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..9e7d0f1b4
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..931cf054b
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/run
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-livestream/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..1ee0d4542
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..bc7951ee6
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/run
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-spectrogram_viewer/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..fe91824a9
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/finish
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..96f6d5534
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/run
@@ -0,0 +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-pi2 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
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/archive/s6-overlay/s6-rc.d/svc-web_terminal/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..e69de29bb
diff --git a/zzz_draft_birdnet-pi2/build.yaml b/zzz_draft_birdnet-pi2/build.yaml
new file mode 100644
index 000000000..cbd4fbd98
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/build.yaml
@@ -0,0 +1,6 @@
+---
+build_from:
+  aarch64: ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm
+  amd64: ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm
+codenotary:
+  signer: alexandrep.github@gmail.com
diff --git a/zzz_draft_birdnet-pi2/config.json b/zzz_draft_birdnet-pi2/config.json
new file mode 100644
index 000000000..607bf75e1
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/config.json
@@ -0,0 +1,102 @@
+{
+  "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",
+  "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-pi2",
+  "version": "1.4",
+  "video": true
+}
diff --git a/zzz_draft_birdnet-pi2/icon.png b/zzz_draft_birdnet-pi2/icon.png
new file mode 100644
index 000000000..c51003cdd
Binary files /dev/null and b/zzz_draft_birdnet-pi2/icon.png differ
diff --git a/zzz_draft_birdnet-pi2/logo.png b/zzz_draft_birdnet-pi2/logo.png
new file mode 100644
index 000000000..c51003cdd
Binary files /dev/null and b/zzz_draft_birdnet-pi2/logo.png 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
new file mode 100644
index 000000000..53e64dbee
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/00_dbus
@@ -0,0 +1,14 @@
+#!/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
+        /usr/bin/pulseaudio --system
+    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
new file mode 100644
index 000000000..1c9797b59
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/00_php_pfm
@@ -0,0 +1,9 @@
+#!/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
new file mode 100644
index 000000000..2ffb3671f
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_avahi
@@ -0,0 +1,9 @@
+#!/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
new file mode 100644
index 000000000..98ab084ee
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_analysis
@@ -0,0 +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
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
new file mode 100644
index 000000000..337d4d82f
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_log
@@ -0,0 +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-pi2 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
new file mode 100644
index 000000000..f7379f36f
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_recording
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..e6c32e5c2
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_birdnet_stats
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bashio
+echo "Starting service: birdnet stats"
+exec \
+    s6-setuidgid "$USER" "$HOME"/birdnet-pi2/birdnet/bin/streamlit run "$HOME"/birdnet-pi2/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
new file mode 100644
index 000000000..9dab002e4
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_chart_viewer
@@ -0,0 +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
diff --git a/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_getty b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_getty
new file mode 100644
index 000000000..97538d6c6
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_getty
@@ -0,0 +1,9 @@
+#!/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
new file mode 100644
index 000000000..4869477e0
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_livestream
@@ -0,0 +1,8 @@
+#!/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
new file mode 100644
index 000000000..ac2da8db4
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_spectrogram_viewer
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000..0864a5d94
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/01_web_terminal
@@ -0,0 +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-pi2 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
new file mode 100644
index 000000000..3bc7a07ff
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.d/02_caddy
@@ -0,0 +1,12 @@
+#!/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/custom-services.e/01_avahi-alias b/zzz_draft_birdnet-pi2/rootfs/custom-services.e/01_avahi-alias
new file mode 100644
index 000000000..8c45399cb
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/custom-services.e/01_avahi-alias
@@ -0,0 +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)"
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
new file mode 100644
index 000000000..ef984723a
--- /dev/null
+++ b/zzz_draft_birdnet-pi2/rootfs/etc/cont-init.d/99-run.sh
@@ -0,0 +1,24 @@
+#!/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-pi2 #
+########################
+
+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
new file mode 100644
index 000000000..203519791
Binary files /dev/null and b/zzz_draft_birdnet-pi2/stats.png differ