diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md
new file mode 100644
index 000000000..dd30af9ee
--- /dev/null
+++ b/jellyfin/CHANGELOG.md
@@ -0,0 +1,61 @@
+## 4.6.0.40
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.39
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.38
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.37
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.36
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.35
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.34
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.33
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.32
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.31
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.30
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.29
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.28
+
+- Update to latest version from linuxserver/docker-jellyfin
+
+## 4.6.0.26
+
+- Update to latest version from linuxserver/docker-jellyfin
+- Enables PUID/GUID options
+- New feature : mount smb share in protected mode
+- New feature : mount multiple smb shares
+- New config/feature : mount smbv1
+- Changed path : changed smb mount path from /storage/externalcifs to /mnt/$NAS name
+- Removed feature : ability to remove protection and mount local hdd, to increase the addon score
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
new file mode 100644
index 000000000..e643704b9
--- /dev/null
+++ b/jellyfin/Dockerfile
@@ -0,0 +1,66 @@
+ARG BUILD_FROM
+ARG BUILD_VERSION
+ARG BUILD_UPSTREAM="10.7.2-1-ls108"
+
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+
+# Set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN apt-get update \
+    \
+    && apt-get install -y --no-install-recommends \
+    jq \
+    \
+    && apt-get -y upgrade cifs-utils \
+    && curl -J -L -o /tmp/bashio.tar.gz \
+    "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
+    && mkdir /tmp/bashio \
+    && tar zxvf \
+    /tmp/bashio.tar.gz \
+    --strip 1 -C /tmp/bashio \
+    \
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -fr \
+    /tmp/* \
+    /var/{cache,log}/* \
+    /var/lib/apt/lists/* \
+    # 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
+
+RUN sed -i "s|/config|/jellyfin|g" /etc/services.d/jellyfin/run \
+    && sed -i "s|/config|/jellyfin|g" /etc/cont-init.d/30-config
+
+# copy local files
+COPY root/ /
+
+### 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/jellyfin/README.md b/jellyfin/README.md
new file mode 100644
index 000000000..72044dac8
--- /dev/null
+++ b/jellyfin/README.md
@@ -0,0 +1,37 @@
+# Home assistant add-on: jellyfin
+
+![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield]
+
+## About
+
+Forked to add latest beta versions, smb and local hdd mount.
+
+- Inital version : https://github.com/petersendev/hassio-addons
+- CIFS code : https://github.com/dianlight/hassio-addons
+
+[jellyfin](https://jellyfin.media/) organizes video, music, live TV, and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone jellyfin Media Server.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-jellyfin) from linuxserver.io.
+
+## Installation
+
+The installation of this add-on is pretty straightforward and not different in
+comparison to installing any other Hass.io add-on.
+
+1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance.
+1. Install this add-on.
+1. Click the `Save` button to store your configuration.
+1. Start the add-on.
+1. Check the logs of the add-on to see if everything went well.
+1. Carefully configure the add-on to your preferences, see the official documentation for for that.
+
+## Configuration
+
+Webui can be found at `<your-ip>:8096`.
+
+[smb-shield]: https://img.shields.io/badge/SMB--green?style=plastic.svg
+[repository]: https://github.com/alexbelgium/hassio-addons
+[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/jellyfin/apparmor.txt b/jellyfin/apparmor.txt
new file mode 100644
index 000000000..f7ee4ef2b
--- /dev/null
+++ b/jellyfin/apparmor.txt
@@ -0,0 +1,49 @@
+#include <tunables/global>
+
+profile addon_db21ed7f_jellyfin_nas 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/ttyUSB0 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/jellyfin/build.json b/jellyfin/build.json
new file mode 100644
index 000000000..a03cb2155
--- /dev/null
+++ b/jellyfin/build.json
@@ -0,0 +1,8 @@
+{
+  "build_from": {
+    "armv7": "linuxserver/jellyfin:arm32v7-",
+    "armhf": "linuxserver/jellyfin:arm32v7-",
+    "aarch64": "linuxserver/jellyfin:arm64v8-",
+    "amd64": "linuxserver/jellyfin:amd64-"
+  }
+}
diff --git a/jellyfin/config.json b/jellyfin/config.json
new file mode 100644
index 000000000..fc9fedb22
--- /dev/null
+++ b/jellyfin/config.json
@@ -0,0 +1,47 @@
+{
+  "name": "jellyfin NAS",
+  "version": "10.7.2-1-ls108",
+  "upstream": "10.7.2-1-ls108",
+  "slug": "jellyfin",
+  "description": "A Free Software Media System that puts you in control of managing and streaming your media.",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "startup": "services",
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "ports": {
+    "8096/tcp": 8096,
+    "8920/tcp": null,
+    "7359/udp": null,
+    "1900/udp": null
+  },
+  "ports_description": {
+    "8096/tcp": "web interface",
+    "8920/tcp": "https web interface (optional)",
+    "7359/udp": "udp server discover (optional)",
+    "1900/udp": "dlna (optional)"
+  },
+  "map": ["config:rw", "share:rw", "media:rw", "ssl"],
+  "webui": "http://[HOST]:[PORT:8096]",
+  "boot": "auto",
+  "apparmor": "true",
+  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
+  "devices": ["/dev/ttyUSB0", "/dev/*", "/dev/sda1"],
+  "full_access": true,
+  "options": {
+    "PUID": 1001,
+    "PGID": 1001,
+    "networkdisks": "//server/share",
+    "cifsusername": "username",
+    "cifspassword": "password",
+    "smbv1": false
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?",
+    "localdisks": "str?",
+    "networkdisks": "str?",
+    "cifsusername": "str?",
+    "cifspassword": "str?",
+    "smbv1": "bool"
+  }
+}
diff --git a/jellyfin/icon.png b/jellyfin/icon.png
new file mode 100644
index 000000000..19f999c4d
Binary files /dev/null and b/jellyfin/icon.png differ
diff --git a/jellyfin/logo.png b/jellyfin/logo.png
new file mode 100644
index 000000000..19f999c4d
Binary files /dev/null and b/jellyfin/logo.png differ
diff --git a/jellyfin/root/etc/cont-init.d/00-ha-env b/jellyfin/root/etc/cont-init.d/00-ha-env
new file mode 100644
index 000000000..3b3e69246
--- /dev/null
+++ b/jellyfin/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
\ No newline at end of file
diff --git a/jellyfin/root/etc/cont-init.d/20-folders b/jellyfin/root/etc/cont-init.d/20-folders
new file mode 100644
index 000000000..9015351ab
--- /dev/null
+++ b/jellyfin/root/etc/cont-init.d/20-folders
@@ -0,0 +1,82 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /jellyfin ]; then
+  echo "Creating /jellyfin"
+  mkdir -p /jellyfin
+  chown -R abc:abc /jellyfin
+fi
+
+if [ ! -d /share/storage/tv ]; then
+  echo "Creating /share/storage/tv"
+  mkdir -p /share/storage/tv
+  chown -R abc:abc /share/storage/tv
+fi
+
+if [ ! -d /share/storage/movies ]; then
+  echo "Creating /share/storage/movies"
+  mkdir -p /share/storage/movies
+  chown -R abc:abc /share/storage/movies
+fi
+
+if [ ! -d /share/jellyfin ]; then
+  echo "Creating /share/jellyfin"
+  mkdir -p /share/jellyfin
+  chown -R abc:abc /share/jellyfin
+fi
+
+if [ ! -d /config/jellyfin ]; then
+  echo "Creating /config/jellyfin"
+  mkdir -p /config/jellyfin
+  chown -R abc:abc /config/jellyfin
+fi
+
+# links
+
+if [ ! -d /jellyfin/cache ]; then
+  echo "Creating link for /jellyfin/cache"
+  mkdir -p /share/jellyfin/cache
+  chown -R abc:abc /share/jellyfin/cache
+  ln -s /share/jellyfin/cache /jellyfin/cache
+fi
+
+if [ ! -d /jellyfin/config ]; then
+  echo "Creating link for /jellyfin/config"
+  mkdir -p /config/jellyfin
+  chown -R abc:abc /config/jellyfin
+  ln -s /config/jellyfin /jellyfin/config
+fi
+
+if [ ! -d /jellyfin/data ]; then
+  echo "Creating link for /jellyfin/data"
+  mkdir -p /share/jellyfin/data
+  chown -R abc:abc /share/jellyfin/data
+  ln -s /share/jellyfin/data /jellyfin/data
+fi
+
+if [ ! -d /jellyfin/logs ]; then
+  echo "Creating link for /jellyfin/logs"
+  mkdir -p /share/jellyfin/logs
+  chown -R abc:abc /share/jellyfin/logs
+  ln -s /share/jellyfin/logs /jellyfin/logs
+fi
+
+if [ ! -d /jellyfin/metadata ]; then
+  echo "Creating link for /jellyfin/metadata"
+  mkdir -p /share/jellyfin/metadata
+  chown -R abc:abc /share/jellyfin/metadata
+  ln -s /share/jellyfin/metadata /jellyfin/metadata
+fi
+
+if [ ! -d /jellyfin/plugins ]; then
+  echo "Creating link for /jellyfin/plugins"
+  mkdir -p /share/jellyfin/plugins
+  chown -R abc:abc /share/jellyfin/plugins
+  ln -s /share/jellyfin/plugins /jellyfin/plugins
+fi
+
+if [ ! -d /jellyfin/root ]; then
+  echo "Creating link for /jellyfin/root"
+  mkdir -p /share/jellyfin/root
+  chown -R abc:abc /share/jellyfin/root
+  ln -s /share/jellyfin/root /jellyfin/root
+fi
diff --git a/jellyfin/root/etc/cont-init.d/92-local_mounts_v1.0 b/jellyfin/root/etc/cont-init.d/92-local_mounts_v1.0
new file mode 100644
index 000000000..6dd2ae565
--- /dev/null
+++ b/jellyfin/root/etc/cont-init.d/92-local_mounts_v1.0
@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+    MOREDISKS=$(bashio::config 'localdisks')
+    bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \
+    for disk in $MOREDISKS 
+    do
+        bashio::log.info "Mount ${disk}"
+        mkdir -p /share/$disk && \
+            if [ ! -d /share/$disk ]; then
+              echo "Creating /share/$disk"
+              mkdir -p /share/$disk
+              chown -R abc:abc /share/$disk
+            fi
+            mount /dev/$disk /share/$disk && \
+            bashio::log.info "Success!"   
+    done || \
+    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
+fi
diff --git a/jellyfin/root/etc/cont-init.d/92-smb_mounts_v1.1 b/jellyfin/root/etc/cont-init.d/92-smb_mounts_v1.1
new file mode 100644
index 000000000..30c677477
--- /dev/null
+++ b/jellyfin/root/etc/cont-init.d/92-smb_mounts_v1.1
@@ -0,0 +1,33 @@
+#!/usr/bin/with-contenv bashio
+
+####################
+# MOUNT SMB SHARES #
+####################
+if bashio::config.has_value 'networkdisks'; then
+    # Mount CIFS Share if configured and if Protection Mode is active
+    bashio::log.info 'Mounting smb share(s)...'
+
+    # Define variables 
+    MOREDISKS=$(bashio::config 'networkdisks')
+    CIFS_USERNAME=$(bashio::config 'cifsusername')
+    CIFS_PASSWORD=$(bashio::config 'cifspassword')
+
+    # Allow SMB1
+    if bashio::config.true 'smbv1'; then
+      SMBVERS=",vers=1.0"
+    else
+      SMBVERS=",vers=2.1"
+    fi
+
+    # Mounting disks
+    for disk in ${MOREDISKS//,/ }  # Separate comma separated values
+    do
+      disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+      diskname=${disk//\\//} #replace \ with /
+      diskname=${diskname##*/} # Get only last part of the name
+      mkdir -p /mnt/$diskname  # Create dir
+      chown -R root:root /mnt/$diskname  # Permissions
+      mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD$SMBVERS $disk /mnt/$diskname && \
+      bashio::log.info "... $disk successfully mounted to /mnt/$diskname" || bashio::log.error "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD" # Mount share
+    done || true
+fi