diff --git a/booksonic_air/CHANGELOG.md b/booksonic_air/CHANGELOG.md
new file mode 100644
index 000000000..4b13fa069
--- /dev/null
+++ b/booksonic_air/CHANGELOG.md
@@ -0,0 +1,34 @@
+## nightly-0.1.0.1024-ls29 (14-11-2021)
+
+- Update to latest version from linuxserver/docker-booksonic-air
+
+## nightly-0.1.0.1019-ls28 (13-11-2021)
+
+- Update to latest version from linuxserver/docker-booksonic-air
+
+## nightly-0.1.0.1011-ls25 (11-11-2021)
+
+- Update to latest version from linuxserver/docker-booksonic-air
+
+## nightly-0.1.0.1006-ls24 (07-11-2021)
+
+- Update to latest version from linuxserver/docker-booksonic-air
+- Allow mounting local drives by label. Just pust the label instead of sda1 for example
+
+## nightly-0.1.0.1003-ls22 (28-10-2021)
+
+- Update to latest version from linuxserver/docker-booksonic-air
+
+## nightly-0.1.0.998-ls20 (23-10-2021)
+
+- Update to latest version from linuxserver/docker-booksonic-air
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
+
+## nightly-0.1.0.997-ls19 (19-10-2021)
+
+- Update to latest version from linuxserver/docker-booksonic-air
+
+## nightly-0.1.0.991-ls16 (13-10-2021)
+
+- Update to latest version from linuxserver/docker-booksonic-air
+- Initial release (nightly builds)
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
new file mode 100644
index 000000000..f98680810
--- /dev/null
+++ b/booksonic_air/Dockerfile
@@ -0,0 +1,69 @@
+ARG BUILD_FROM
+ARG BUILD_VERSION
+FROM linuxserver/booksonic-air:latest
+ARG BASHIO_VERSION=0.13.1
+
+RUN \
+    ################
+    # Install apps #
+    ################
+    apt-get clean \
+    && apt-get update \
+    && apt-get install -y \
+    jq \
+    curl \
+    cifs-utils \
+    keyutils \
+    samba \
+    smbclient \
+    \ 
+    ###################
+    # Install bashio #
+    ##################
+    && mkdir -p /tmp/bashio \
+    && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
+    | tar -xzf - --strip 1 -C /tmp/bashio \
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -rf /tmp/bashio \
+    \
+    #################
+    # Correct image #
+    #################
+    && sed -i "s|/config|/config/booksonic-air|g" /etc/cont-init.d/* \
+    # Allow UID and GID setting
+    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
+    && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
+    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
+
+# copy local files
+COPY root/ / 
+ENV BOOKSONIC_AIR_SETTINGS="/data"
+
+
+### 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}
diff --git a/booksonic_air/Readme.md b/booksonic_air/Readme.md
new file mode 100644
index 000000000..f29b4b44b
--- /dev/null
+++ b/booksonic_air/Readme.md
@@ -0,0 +1,70 @@
+# Home assistant add-on: booksonic-air
+
+[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
+
+[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white
+
+![Supports 
+ Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield]
+![Supports smb mounts][smb-shield]
+
+_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://reporoster.com/stars/alexbelgium/hassio-addons)](https://github.com/alexbelgium/hassio-addons/stargazers)
+
+## About
+
+---
+
+[Booksonic-air](http://booksonic.org/) is a platform for accessing the audibooks you own wherever you are. At the moment the platform consists of Booksonic Air - A server for streaming your audiobooks, successor to the original Booksonic server and based on Airsonic. Booksonic App - An DSub based Android app for connection to Booksonic-Air servers.
+This addon is based on the docker image https://github.com/linuxserver/docker-booksonic-air
+
+## 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
+
+## Configuration
+
+---
+
+Webui can be found at <http://your-ip:PORT>.
+The default username/password : described in the startup log.
+Configurations can be done through the app webUI, except for the following options
+
+```yaml
+GUID: user
+GPID: user
+TZ: timezone
+localdisks: sda1 #put the hardware name of your drive to mount separated by commas, or its label. Ex: sda1, sdb1, MYNAS...
+networkdisks: "//SERVER/SHARE" # optional, list of smb servers to mount, separated by commas
+cifsusername: "username" # optional, smb username, same for all smb shares
+cifspassword: "password" # optional, smb password
+```
+
+## Support
+
+Create an issue on github
+
+## Illustration
+
+---
+
+![illustration](https://booksonic-air.com/img/slider/artistdetails.png)
+
+[repository]: https://github.com/alexbelgium/hassio-addons
+[smb-shield]: https://img.shields.io/badge/smb-yes-green.svg
+[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
diff --git a/booksonic_air/apparmor.txt b/booksonic_air/apparmor.txt
new file mode 100644
index 000000000..b9f61c01b
--- /dev/null
+++ b/booksonic_air/apparmor.txt
@@ -0,0 +1,48 @@
+#include <tunables/global>
+
+profile booksonic-air_addon flags=(attach_disconnected,mediate_deleted) {
+  #include <abstractions/base>
+  
+  capability,
+  file,
+  mount,
+  umount,
+  remount,
+
+  capability setgid,
+  capability setuid,
+  capability sys_admin, 
+  capability dac_read_search, 
+  # capability dac_override,
+  # capability sys_rawio,
+
+# S6-Overlay
+  /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/sda1 mrwkl,
+  /dev/sdb1 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/booksonic_air/config.json b/booksonic_air/config.json
new file mode 100644
index 000000000..1543f3554
--- /dev/null
+++ b/booksonic_air/config.json
@@ -0,0 +1,56 @@
+{
+  "apparmor": true,
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "boot": "auto",
+  "description": "platform for accessing the audibooks you own wherever you are",
+  "devices": [
+    "/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"
+  ],
+  "environment": {
+    "PUID": "0",
+    "PGID": "0"
+  },
+  "map": ["config:rw", "share:rw", "media:rw", "config:rw"],
+  "name": "Booksonic-air",
+  "options": {
+    "PUID": 0,
+    "PGID": 0,
+    "networkdisks": "<//SERVER/SHARE>,<//SERVER2/SHARE2>",
+    "cifsusername": "<username>",
+    "cifspassword": "<password>"
+  },
+  "ports": {
+    "4040/tcp": 4040
+  },
+  "ports_description": {
+    "4040/tcp": "web interface"
+  },
+  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?",
+    "localdisks": "str?",
+    "networkdisks": "str?",
+    "cifsusername": "str?",
+    "cifspassword": "str?"
+  },
+  "slug": "booksonic-air_nas",
+  "upstream": "v2009.1.0-ls37",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "v2009.1.0-ls37",
+  "webui": "http://[HOST]:[PORT:4040]"
+}
diff --git a/booksonic_air/icon.png b/booksonic_air/icon.png
new file mode 100644
index 000000000..4232ac91a
Binary files /dev/null and b/booksonic_air/icon.png differ
diff --git a/booksonic_air/logo.png b/booksonic_air/logo.png
new file mode 100644
index 000000000..4232ac91a
Binary files /dev/null and b/booksonic_air/logo.png differ
diff --git a/booksonic_air/root/etc/cont-init.d/00-aaa.sh b/booksonic_air/root/etc/cont-init.d/00-aaa.sh
new file mode 100644
index 000000000..ef9ab3fb2
--- /dev/null
+++ b/booksonic_air/root/etc/cont-init.d/00-aaa.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+if [ ! -f "/usr/bin/bashio" ]; then
+    echo "Bashio does not exist, executing script"
+
+    ################
+    # Install apps #
+    ################
+    apt-get clean
+    apt-get update
+    apt-get install -y --no-install-recommends \
+    jq \
+    cifs-utils \ 
+    keyutils \
+    samba \
+    smbclient
+    apt-get clean
+
+    ###################
+    # Install bashio #
+    ##################
+    BASHIO_VERSION=0.13.1
+    mkdir -p /tmp/bashio
+    curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" |
+        tar -xzf - --strip 1 -C /tmp/bashio
+    mv /tmp/bashio/lib /usr/lib/bashio
+    ln -s /usr/lib/bashio/bashio /usr/bin/bashio
+    rm -rf /tmp/bashio
+
+    echo "Bashio installed"
+fi
diff --git a/booksonic_air/root/etc/cont-init.d/00-banner.sh b/booksonic_air/root/etc/cont-init.d/00-banner.sh
new file mode 100644
index 000000000..71b1a4e4e
--- /dev/null
+++ b/booksonic_air/root/etc/cont-init.d/00-banner.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: Base Images
+# Displays a simple add-on banner on startup
+# ==============================================================================
+if bashio::supervisor.ping; then
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue " Add-on: $(bashio::addon.name)"
+    bashio::log.blue " $(bashio::addon.description)"
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+
+    bashio::log.blue " Add-on version: $(bashio::addon.version)"
+    if bashio::var.true "$(bashio::addon.update_available)"; then
+        bashio::log.magenta ' There is an update available for this add-on!'
+        bashio::log.magenta \
+        " Latest add-on version: $(bashio::addon.version_latest)"
+        bashio::log.magenta ' Please consider upgrading as soon as possible.'
+    else
+        bashio::log.green ' You are running the latest version of this add-on.'
+    fi
+
+    bashio::log.blue " System: $(bashio::info.operating_system)" \
+    " ($(bashio::info.arch) / $(bashio::info.machine))"
+    bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
+    bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
+
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue \
+    ' Please, share the above information when looking for help'
+    bashio::log.blue \
+    ' or support in, e.g., GitHub, forums or the Discord chat.'
+    bashio::log.green \
+    ' https://github.com/alexbelgium/hassio-addons'
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+fi
diff --git a/booksonic_air/root/etc/cont-init.d/00-ha-env b/booksonic_air/root/etc/cont-init.d/00-ha-env
new file mode 100644
index 000000000..342068f41
--- /dev/null
+++ b/booksonic_air/root/etc/cont-init.d/00-ha-env
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bashio
+
+for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do
+    printf "$(bashio::config $k)" > /var/run/s6/container_environment/$k
+done
diff --git a/booksonic_air/root/etc/cont-init.d/92-local_mounts.sh b/booksonic_air/root/etc/cont-init.d/92-local_mounts.sh
new file mode 100644
index 000000000..0920d68bd
--- /dev/null
+++ b/booksonic_air/root/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+
+# Mount local Share if configured
+if bashio::config.has_value 'localdisks'; then
+
+  MOREDISKS=$(bashio::config 'localdisks')
+  echo "Local Disks mounting..."
+
+  # Separate comma separated values
+  for disk in ${MOREDISKS//,/ }; do
+
+    # Mount by device as default
+    devpath=/dev
+
+    # Mount as label
+    [ ${disk:0:2} != "sd" ] && devpath=/dev/disk/by-label
+
+    # Creates dir
+    mkdir -p /mnt/$disk
+    chown -R $(id -u):$(id -g) /mnt/$disk
+    # Legacy mounting : mount to share if still exists (avoid breaking changes)
+    [ -d /share/$disk ] && mount $devpath/$disk /share/$disk || true
+    # Mount
+    mount $devpath/$disk /mnt/$disk && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk)
+
+  done
+
+fi
diff --git a/booksonic_air/root/etc/cont-init.d/92-smb_mounts.sh b/booksonic_air/root/etc/cont-init.d/92-smb_mounts.sh
new file mode 100644
index 000000000..06410e554
--- /dev/null
+++ b/booksonic_air/root/etc/cont-init.d/92-smb_mounts.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/with-contenv bashio
+
+#########################
+# MOUNT SMB SHARES v1.6 #
+#########################
+if bashio::config.has_value 'networkdisks'; then
+
+  # Define variables
+  MOREDISKS=$(bashio::config 'networkdisks')
+  CIFS_USERNAME=$(bashio::config 'cifsusername')
+  CIFS_PASSWORD=$(bashio::config 'cifspassword')
+  MOUNTED=false
+  SMBVERS=""
+  SECVERS=""
+
+  # Mount CIFS Share if configured and if Protection Mode is active
+  echo 'Mounting smb share(s)...'
+
+  if bashio::config.has_value 'cifsdomain'; then
+    DOMAIN=",domain=$(bashio::config 'cifsdomain')"
+  else
+    DOMAIN=""
+  fi
+
+  # Mounting disks
+  for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
+
+    # Clean name of network share
+    disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+    diskname=${disk//\\//}            #replace \ with /
+    diskname=${diskname##*/}          # Get only last part of the name
+
+    # Data validation
+    if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then
+      bashio::log.fatal "The structure of your \"networkdisks\" option : \"$disk\" doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2. If you don't use it, you can simply remove the text, this will avoid this error message in the future."
+      exit 0
+    fi
+
+    # Prepare mount point
+    mkdir -p /mnt/$diskname
+    chown -R root:root /mnt/$diskname
+
+    #Tries to mount with default options
+    mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
+
+    # if Fail test different smb and sec versions
+    if [ $MOUNTED = false ]; then
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
+        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
+        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
+          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
+        done
+      done
+    fi
+
+    # Messages
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
+      #Test write permissions
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze &&
+        bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" ||
+        bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
+    else
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      #smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD  || true
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
+      rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
+    fi
+
+  done
+fi