diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md
new file mode 100644
index 000000000..c730cc82e
--- /dev/null
+++ b/jellyfin/CHANGELOG.md
@@ -0,0 +1,32 @@
+## 0.7.1
+
+ - Mount /media folder
+
+## 0.7.0
+
+ - Update emby to 4.5.2.0 (linuxserver/emby:4.5.2.0-ls58)
+
+## 0.6.0
+
+ - Update emby to 4.5.1.0 (linuxserver/emby:4.5.1.0-ls58)
+
+## 0.5.0
+
+ - Update emby to 4.5.0.50 (linuxserver/emby:4.5.0.50-ls56)
+
+## 0.4.0
+
+ - Update emby to 4.4.3.0 (linuxserver/emby:4.4.3.0-ls45)
+
+## 0.3.0
+
+ - Update emby to 4.4.2.0 (linuxserver/emby:4.4.2.0-ls40)
+
+## 0.2.0
+
+ - not a legacy addon anymore
+ - Update base image to linuxserver/emby:4.3.1.0-ls31
+
+## 0.1.0
+
+ - emby to 4.3.1.0 (linuxserver/emby:4.3.1.0-ls26)
\ No newline at end of file
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
new file mode 100644
index 000000000..d90be9960
--- /dev/null
+++ b/jellyfin/Dockerfile
@@ -0,0 +1,33 @@
+ARG BUILD_FROM
+# hadolint ignore=DL3006
+FROM $BUILD_FROM
+
+# Set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN apt-get update \
+    \
+    && apt-get install -y --no-install-recommends \
+        jq=1.5+dfsg-2 \
+    \
+    && 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/*
+
+# copy local files
+COPY root/ /
+
+RUN sed -i "s|/config|/jellyfin|g" /etc/services.d/jellyfin/run \
+    && sed -i "s|/config|/jellyfin|g" /etc/cont-init.d/30-config
+
diff --git a/jellyfin/README.md b/jellyfin/README.md
new file mode 100644
index 000000000..f6e143db6
--- /dev/null
+++ b/jellyfin/README.md
@@ -0,0 +1,31 @@
+# Hassio Add-ons by alexbelgium: Jellyfin
+
+## About
+
+Forked to add latest 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`.
+
+
+[repository]: https://github.com/alexbelgium/hassio-addons
diff --git a/jellyfin/build.json b/jellyfin/build.json
new file mode 100644
index 000000000..536993622
--- /dev/null
+++ b/jellyfin/build.json
@@ -0,0 +1,14 @@
+{
+    "build_from_template": {
+        "image": "linuxserver/jellyfin",
+        "version": "latest"
+    },
+    "build_from": {
+        "armv7": "linuxserver/jellyfin:arm32v7-latest",
+        "armhf": "linuxserver/jellyfin:arm32v7-latest",
+        "aarch64": "linuxserver/jellyfin:arm64v8-latest",
+        "amd64": "linuxserver/jellyfin:amd64-latest"
+    },
+    "squash": false,
+    "args": {}
+}
diff --git a/jellyfin/config.json b/jellyfin/config.json
new file mode 100644
index 000000000..918a51c9c
--- /dev/null
+++ b/jellyfin/config.json
@@ -0,0 +1,55 @@
+{
+  "name": "Jellyfin with smb and hdd",
+  "version": "2.0",
+  "slug": "jellyfin_nas",
+  "legacy": false,
+  "maintenance": {
+    "github_release": "https://github.com/linuxserver/docker-jellyfin",
+    "version_regex": "(\\d+\\.\\d+\\.\\d+.\\d+)-(ls\\d+)"
+  },
+  "description": "A Free Software Media System that puts you in control of managing and streaming your media.",
+  "url": "https://github.com/petersendev/hassio-addons/tree/master/jellyfin#readme",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armv7",
+	"armhf"
+  ],
+  "ports": {
+    "8096/tcp": 8096,
+    "8920/tcp": null
+  },
+  "ports_description": {
+    "8096/tcp": "web interface",
+    "8920/tcp": "https web interface (optional)"
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "media:rw",
+    "ssl"
+  ],
+  "webui": "http://[HOST]:[PORT:8096]",
+  "boot": "auto",
+  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
+  "full_access": true,
+  "options": {
+    "PUID": 1001,
+    "PGID": 1001,
+    "localdisks": "/dev/sdb1",
+    "networkdisks": "<//SERVER/SHARE>",
+    "cifsusername": "<username>",
+    "cifspassword": "<password>"
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?",
+    "localdisks": "str",
+    "networkdisks": "str",
+    "cifsusername": "str",
+    "cifspassword": "str"
+  }
+
+}
diff --git a/jellyfin/icon.png b/jellyfin/icon.png
new file mode 100644
index 000000000..fe71933da
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..fe71933da
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..9df7c6936
--- /dev/null
+++ b/jellyfin/root/etc/cont-init.d/20-folders
@@ -0,0 +1,70 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /jellyfin ]; then
+  echo "Creating /jellyfin"
+  mkdir -p /jellyfin
+  chown -R abc:abc /jellyfin
+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/50-mounts b/jellyfin/root/etc/cont-init.d/50-mounts
new file mode 100644
index 000000000..ab6c54ec2
--- /dev/null
+++ b/jellyfin/root/etc/cont-init.d/50-mounts
@@ -0,0 +1,46 @@
+#!/usr/bin/with-contenv bashio
+
+#!/usr/bin/with-contenv bashio
+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/storage && \
+            if [ ! -d /share/storage ]; then
+              echo "Creating /share/storage"
+              mkdir -p /share/storage
+              chown -R abc:abc /share/storage
+            fi
+
+            mount $disk /share/storage && \
+            bashio::log.info "Success!"   
+    done || \
+    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
+fi
+
+# Mount CIFS Share if configured and if Protection Mode is active
+if bashio::config.has_value 'networkdisks'; then
+    MOREDISKS=$(bashio::config 'networkdisks')
+    CIFS_USERNAME=$(bashio::config 'cifsusername')
+    CIFS_PASSWORD=$(bashio::config 'cifspassword')
+    bashio::log.info "Network Disks mounting.. ${MOREDISKS}" && \
+    for disk in $MOREDISKS 
+    do
+        bashio::log.info "Mount ${disk}"
+        mkdir -p /share/storagecifs && \
+            if [ ! -d /share/storagecifs ]; then
+              echo "Creating /share/storagecifs"
+              mkdir -p /share/storagecifs
+              chown -R abc:abc /share/storagecifs
+            fi
+
+            mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /share/storagecifs && \
+            bashio::log.info "Success!"   
+    done || \
+    bashio::log.warning "Protection mode is ON. Unable to mount external drives!"
+fi