diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cdc4d7723..ac4780798 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -103,6 +103,19 @@ jobs:
       addon: 'radarr'
       arch: '--all'
 
+- job: 'emby'
+  condition: and(eq(variables['Build.SourceBranchName'], 'master'), succeeded('Hadolint'), succeeded('JQ'))
+  dependsOn:
+  - 'Hadolint'
+  - 'JQ'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - template: .azure-pipelines/addon-template.yml
+    parameters:
+      addon: 'emby'
+      arch: '--all'
+
 - job: 'jellyfin'
   condition: and(eq(variables['Build.SourceBranchName'], 'master'), succeeded('Hadolint'), succeeded('JQ'))
   dependsOn:
@@ -114,4 +127,4 @@ jobs:
   - template: .azure-pipelines/addon-template.yml
     parameters:
       addon: 'jellyfin'
-      arch: '--all'
\ No newline at end of file
+      arch: '--all'
diff --git a/emby/CHANGELOG.md b/emby/CHANGELOG.md
new file mode 100644
index 000000000..b76b66596
--- /dev/null
+++ b/emby/CHANGELOG.md
@@ -0,0 +1,3 @@
+## 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/emby/Dockerfile b/emby/Dockerfile
new file mode 100644
index 000000000..a602abedb
--- /dev/null
+++ b/emby/Dockerfile
@@ -0,0 +1,10 @@
+FROM linuxserver/emby:4.3.1.0-ls26
+
+RUN sed -i "s|/config|/emby|g" /etc/services.d/emby/run \
+    && sed -i "s|/config|/emby|g" /etc/cont-init.d/30-config 
+
+RUN cat /etc/services.d/emby/run
+
+# copy local files
+COPY root/ /
+
diff --git a/emby/README.md b/emby/README.md
new file mode 100644
index 000000000..efc34a94f
--- /dev/null
+++ b/emby/README.md
@@ -0,0 +1,27 @@
+# Hassio Add-ons by petersendev: emby
+
+## About
+
+[emby](https://emby.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 emby Media Server.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-emby) 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/petersendev/hassio-addons
\ No newline at end of file
diff --git a/emby/config.json b/emby/config.json
new file mode 100644
index 000000000..99d965224
--- /dev/null
+++ b/emby/config.json
@@ -0,0 +1,41 @@
+{
+  "name": "emby",
+  "version": "0.1.0",
+  "slug": "emby",
+  "legacy": true,
+  "maintenance": {
+    "github_release": "https://github.com/linuxserver/docker-emby",
+    "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/emby",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf"
+  ],
+  "ports": {
+    "8096/tcp": 8096
+  },
+  "ports_description": {
+    "8096/tcp": "web interface"
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl"
+  ],
+  "webui": "http://[HOST]:[PORT:8096]",
+  "boot": "auto",
+  "options": {
+    "PUID": 1001,
+    "PGID": 1001
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?"
+  },
+  "image": "petersendev/hassio-emby-{arch}"
+}
diff --git a/emby/icon.png b/emby/icon.png
new file mode 100644
index 000000000..fe71933da
Binary files /dev/null and b/emby/icon.png differ
diff --git a/emby/logo.png b/emby/logo.png
new file mode 100644
index 000000000..fe71933da
Binary files /dev/null and b/emby/logo.png differ
diff --git a/emby/root/etc/cont-init.d/20-folders b/emby/root/etc/cont-init.d/20-folders
new file mode 100644
index 000000000..8f46b7ce5
--- /dev/null
+++ b/emby/root/etc/cont-init.d/20-folders
@@ -0,0 +1,82 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /emby ]; then
+  echo "Creating /emby"
+  mkdir -p /emby
+  chown -R abc:abc /emby
+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/emby ]; then
+  echo "Creating /share/emby"
+  mkdir -p /share/emby
+  chown -R abc:abc /share/emby
+fi
+
+if [ ! -d /config/emby ]; then
+  echo "Creating /config/emby"
+  mkdir -p /config/emby
+  chown -R abc:abc /config/emby
+fi
+
+# links
+
+if [ ! -d /emby/cache ]; then
+  echo "Creating link for /emby/cache"
+  mkdir -p /share/emby/cache
+  chown -R abc:abc /share/emby/cache
+  ln -s /share/emby/cache /emby/cache
+fi
+
+if [ ! -d /emby/config ]; then
+  echo "Creating link for /emby/config"
+  mkdir -p /config/emby
+  chown -R abc:abc /config/emby
+  ln -s /config/emby /emby/config
+fi
+
+if [ ! -d /emby/data ]; then
+  echo "Creating link for /emby/data"
+  mkdir -p /share/emby/data
+  chown -R abc:abc /share/emby/data
+  ln -s /share/emby/data /emby/data
+fi
+
+if [ ! -d /emby/logs ]; then
+  echo "Creating link for /emby/logs"
+  mkdir -p /share/emby/logs
+  chown -R abc:abc /share/emby/logs
+  ln -s /share/emby/logs /emby/logs
+fi
+
+if [ ! -d /emby/metadata ]; then
+  echo "Creating link for /emby/metadata"
+  mkdir -p /share/emby/metadata
+  chown -R abc:abc /share/emby/metadata
+  ln -s /share/emby/metadata /emby/metadata
+fi
+
+if [ ! -d /emby/plugins ]; then
+  echo "Creating link for /emby/plugins"
+  mkdir -p /share/emby/plugins
+  chown -R abc:abc /share/emby/plugins
+  ln -s /share/emby/plugins /emby/plugins
+fi
+
+if [ ! -d /emby/root ]; then
+  echo "Creating link for /emby/root"
+  mkdir -p /share/emby/root
+  chown -R abc:abc /share/emby/root
+  ln -s /share/emby/root /emby/root
+fi
diff --git a/hydra2/CHANGELOG.md b/hydra2/CHANGELOG.md
index 3e49621b3..7d3eb7885 100644
--- a/hydra2/CHANGELOG.md
+++ b/hydra2/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.0
+
+ - Update hydra2 to 2.10.8 (linuxserver/hydra2:v2.10.8-ls50)
+
 ## 0.7.0
 
  - Update hydra2 to 2.10.2 (linuxserver/hydra2:v2.10.2-ls49)
diff --git a/hydra2/Dockerfile b/hydra2/Dockerfile
index 7e54a30c6..87580d101 100644
--- a/hydra2/Dockerfile
+++ b/hydra2/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxserver/hydra2:v2.10.2-ls49
+FROM linuxserver/hydra2:v2.10.8-ls50
 
 # use /data instead of /config for hass.io environment
 RUN sed -i "s|/config|/config/hydra2|g" /etc/services.d/nzbhydra2/run \
diff --git a/hydra2/config.json b/hydra2/config.json
index 683b0c425..bf3972817 100644
--- a/hydra2/config.json
+++ b/hydra2/config.json
@@ -1,6 +1,6 @@
 {
   "name": "hydra2",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "slug": "hydra2",
   "legacy": true,
   "maintenance": {
diff --git a/jellyfin/README.md b/jellyfin/README.md
index d6367bf1d..269f1ae51 100644
--- a/jellyfin/README.md
+++ b/jellyfin/README.md
@@ -21,7 +21,7 @@ comparison to installing any other Hass.io add-on.
 
 ## Configuration
 
-Webui can be found at `<your-ip>:8989`.
+Webui can be found at `<your-ip>:8096`.
 
 
 [repository]: https://github.com/petersendev/hassio-addons
\ No newline at end of file