diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md
new file mode 100644
index 000000000..3ec36c152
--- /dev/null
+++ b/jackett/CHANGELOG.md
@@ -0,0 +1,68 @@
+## 0.17.0
+
+ - Update jackett to 0.16.2274 (linuxserver/jackett:v0.16.2274-ls7)
+
+## 0.16.0
+
+ - Update jackett to 0.16.1724 (linuxserver/jackett:v0.16.1724-ls20)
+
+## 0.15.0
+
+ - Update jackett to 0.16.1621 (linuxserver/jackett:v0.16.1621-ls20)
+
+## 0.14.0
+
+ - Update jackett to 0.16.1327 (linuxserver/jackett:v0.16.1327-ls18)
+
+## 0.13.0
+
+ - Update jackett to 0.16.1023 (linuxserver/jackett:v0.16.1023-ls15)
+
+## 0.12.0
+
+ - Update jackett to 0.16.962 (linuxserver/jackett:v0.16.962-ls13)
+
+## 0.11.0
+
+ - Update jackett to 0.16.938 (linuxserver/jackett:v0.16.938-ls13)
+
+## 0.10.0
+
+ - Update jackett to 0.16.800 (linuxserver/jackett:v0.16.800-ls8)
+
+## 0.9.0
+
+ - Update jackett to 0.16.770 (linuxserver/jackett:v0.16.770-ls7)
+
+## 0.8.0
+
+ - Update jackett to 0.16.324 (linuxserver/jackett:v0.16.324-ls64)
+
+## 0.7.0
+
+ - Update jackett to 0.14.79 (linuxserver/jackett:v0.14.79-ls56)
+
+## 0.6.0
+
+ - Update jackett to 0.13.280 (linuxserver/jackett:v0.13.280-ls55)
+
+## 0.5.0
+
+ - Update jackett to 0.13.188 (linuxserver/jackett:v0.13.188-ls55)
+
+## 0.4.0
+
+ - not a legacy addon anymore
+ - Update jackett to 0.13.144 (linuxserver/jackett:v0.13.144-ls55)
+
+## 0.3.0
+
+ - Update jackett to 0.13.127 (linuxserver/jackett:v0.13.127-ls54)
+
+## 0.2.0
+
+ - Update jackett to 0.12.1638 (linuxserver/jackett:v0.12.1638-ls51)
+
+## 0.1.0
+
+ - jackett 0.12.1635 (linuxserver/jackett:v0.12.1635-ls51)
\ No newline at end of file
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
new file mode 100644
index 000000000..7d5d99310
--- /dev/null
+++ b/jackett/Dockerfile
@@ -0,0 +1,23 @@
+ARG BUILD_FROM
+# hadolint ignore=DL3006
+FROM $BUILD_FROM
+
+RUN 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/* 
+
+# use /data instead of /config for hass.io environment
+RUN sed -i "s|/config|/config/jackett|g" /etc/cont-init.d/30-config
+
+ENV XDG_DATA_HOME="/share/jackett" \
+XDG_CONFIG_HOME="/config/jackett"
+
+# copy local files
+COPY root/ /
\ No newline at end of file
diff --git a/jackett/README.md b/jackett/README.md
new file mode 100644
index 000000000..f0e45b640
--- /dev/null
+++ b/jackett/README.md
@@ -0,0 +1,26 @@
+# Hassio Add-ons by petersendev: jackett
+
+## About
+
+[Jackett](https://github.com/Jackett/Jackett) works as a proxy server: it translates queries from apps (Sonarr, SickRage, CouchPotato, Mylar, etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-jackett) 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>:9117`.
+
+[repository]: https://github.com/petersendev/hassio-addons
\ No newline at end of file
diff --git a/jackett/build.json b/jackett/build.json
new file mode 100644
index 000000000..1a9489e3a
--- /dev/null
+++ b/jackett/build.json
@@ -0,0 +1,13 @@
+{
+    "build_from_template": {
+        "image": "linuxserver/jackett",
+        "version": "latest"
+    },
+    "build_from": {
+        "armhf": "linuxserver/jackett:arm32v7-latest",
+        "aarch64": "linuxserver/jackett:arm64v8-latest",
+        "amd64": "linuxserver/jackett:amd64-latest"
+    },
+    "squash": false,
+    "args": {}
+}
diff --git a/jackett/config.json b/jackett/config.json
new file mode 100644
index 000000000..b2cad1165
--- /dev/null
+++ b/jackett/config.json
@@ -0,0 +1,46 @@
+{
+  "name": "jackett",
+  "version": "0.17.0",
+  "slug": "jackett",
+  "legacy": false,
+  "maintenance": {
+    "github_release": "https://github.com/linuxserver/docker-jackett",
+    "version_regex": "v(\\d+\\.\\d+\\.\\d+)-(ls\\d+)"
+  },
+  "description": "API Support for your favorite torrent trackers",
+  "url": "https://github.com/petersendev/hassio-addons/tree/master/jackett#readme",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armv7",
+    "armhf"
+  ],
+  "ports": {
+    "9117/tcp": 9117
+  },
+  "ports_description": {
+    "9117/tcp": "web interface"
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl"
+  ],
+  "webui": "http://[HOST]:[PORT:9117]",
+  "boot": "auto",
+  "options": {
+    "PUID": 1001,
+    "PGID": 1001
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?"
+  },
+  "environment": {
+    "XDG_DATA_HOME": "/share/jackett",
+    "XDG_CONFIG_HOME": "/config/jackett"
+  },
+  "image": "petersendev/hassio-jackett-{arch}"
+}
diff --git a/jackett/icon.png b/jackett/icon.png
new file mode 100644
index 000000000..7fa9aa8e7
Binary files /dev/null and b/jackett/icon.png differ
diff --git a/jackett/logo.png b/jackett/logo.png
new file mode 100644
index 000000000..7fa9aa8e7
Binary files /dev/null and b/jackett/logo.png differ
diff --git a/jackett/root/etc/cont-init.d/00-ha-env b/jackett/root/etc/cont-init.d/00-ha-env
new file mode 100644
index 000000000..3b3e69246
--- /dev/null
+++ b/jackett/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/jackett/root/etc/cont-init.d/20-folders b/jackett/root/etc/cont-init.d/20-folders
new file mode 100644
index 000000000..916813cf5
--- /dev/null
+++ b/jackett/root/etc/cont-init.d/20-folders
@@ -0,0 +1,13 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /config/jackett ]; then
+  echo "Creating /config/jackett"
+  mkdir -p /config/jackett
+  chown -R abc:abc /config/jackett
+fi
+
+if [ ! -d /share/jackett ]; then
+  echo "Creating /share/jackett"
+  mkdir -p /share/jackett
+  chown -R abc:abc /share/jackett
+fi
\ No newline at end of file
diff --git a/radarr/CHANGELOG.md b/radarr/CHANGELOG.md
new file mode 100644
index 000000000..17608c7cc
--- /dev/null
+++ b/radarr/CHANGELOG.md
@@ -0,0 +1,27 @@
+## 0.6.1
+
+ - Mount /media folder
+
+## 0.6.0
+
+ - Update radarr to 0.2.0.1504 (linuxserver/radarr:v0.2.0.1504-ls68)
+
+## 0.5.0
+
+ - not a legacy addon anymore
+ 
+ ## 0.4.0
+
+ - Update radarr to 0.2.0.1480 (linuxserver/radarr:v0.2.0.1480-ls51)
+
+## 0.3.2
+
+ - set snapshot_exclude for logs and MediaCover
+
+## 0.3.0
+
+ - Update radarr to 0.2.0.1450 (linuxserver/radarr:v0.2.0.1450-ls46)
+
+## 0.2.0
+
+ - Update radarr to 0.2.0.1358 (linuxserver/radarr:v0.2.0.1358-ls22)
\ No newline at end of file
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
new file mode 100644
index 000000000..f7425a738
--- /dev/null
+++ b/radarr/Dockerfile
@@ -0,0 +1,21 @@
+ARG BUILD_FROM
+# hadolint ignore=DL3006
+FROM $BUILD_FROM
+
+RUN 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/* 
+
+# use /data instead of /config for hass.io environment
+RUN sed -i "s|/config|/config/radarr|g" /etc/services.d/radarr/run \
+    && sed -i "s|/config|/config/radarr|g" /etc/cont-init.d/30-config
+
+# copy local files
+COPY root/ /
diff --git a/radarr/README.md b/radarr/README.md
new file mode 100644
index 000000000..d30b5c586
--- /dev/null
+++ b/radarr/README.md
@@ -0,0 +1,27 @@
+# Hassio Add-ons by petersendev: Radarr
+
+## About
+
+[Radarr](https://github.com/Radarr/Radarr) - A fork of Sonarr to work with movies à la Couchpotato.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-radarr) 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>:7878`.
+
+
+[repository]: https://github.com/petersendev/hassio-addons
\ No newline at end of file
diff --git a/radarr/build.json b/radarr/build.json
new file mode 100644
index 000000000..52253a465
--- /dev/null
+++ b/radarr/build.json
@@ -0,0 +1,13 @@
+{
+    "build_from_template": {
+        "image": "linuxserver/radarr",
+        "version": "latest"
+    },
+    "build_from": {
+        "armhf": "linuxserver/radarr:arm32v7-latest",
+        "aarch64": "linuxserver/radarr:arm64v8-latest",
+        "amd64": "linuxserver/radarr:amd64-latest"
+    },
+    "squash": false,
+    "args": {}
+}
diff --git a/radarr/config.json b/radarr/config.json
new file mode 100644
index 000000000..ab520648a
--- /dev/null
+++ b/radarr/config.json
@@ -0,0 +1,48 @@
+{
+  "name": "radarr",
+  "version": "0.6.1",
+  "slug": "radarr",
+  "legacy": false,
+  "maintenance": {
+    "github_release": "https://github.com/linuxserver/docker-radarr",
+    "version_regex": "v(\\d+\\.\\d+\\.\\d+\\.\\d+)-(ls\\d+)"
+  },
+  "description": "A fork of Sonarr to work with movies à la Couchpotato",
+  "url": "https://github.com/petersendev/hassio-addons/tree/master/radarr#readme",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armv7",
+    "armhf"
+  ],
+  "ports": {
+    "7878/tcp": 7878
+  },
+  "ports_description": {
+    "7878/tcp": "web interface"
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "media:rw",
+    "ssl"
+  ],
+  "webui": "http://[HOST]:[PORT:7878]",
+  "boot": "auto",
+  "options": {
+    "PUID": 1001,
+    "PGID": 1001
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?"
+  },
+  "snapshot_exclude": [
+    "**/Backups/*",
+    "**/logs/*",
+    "**/MediaCover/*"
+  ],
+  "image": "petersendev/hassio-radarr-{arch}"
+}
diff --git a/radarr/icon.png b/radarr/icon.png
new file mode 100644
index 000000000..5e143b52e
Binary files /dev/null and b/radarr/icon.png differ
diff --git a/radarr/logo.png b/radarr/logo.png
new file mode 100644
index 000000000..5e143b52e
Binary files /dev/null and b/radarr/logo.png differ
diff --git a/radarr/root/etc/cont-init.d/00-ha-env b/radarr/root/etc/cont-init.d/00-ha-env
new file mode 100644
index 000000000..3b3e69246
--- /dev/null
+++ b/radarr/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/radarr/root/etc/cont-init.d/20-folders b/radarr/root/etc/cont-init.d/20-folders
new file mode 100644
index 000000000..9fcadd756
--- /dev/null
+++ b/radarr/root/etc/cont-init.d/20-folders
@@ -0,0 +1,19 @@
+#!/usr/bin/with-contenv bash
+
+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/downloads ]; then
+  echo "Creating /share/downloads"
+  mkdir -p /share/downloads
+  chown -R abc:abc /share/downloads
+fi
+
+if [ ! -d /config/radarr ]; then
+  echo "Creating /config/radarr"
+  mkdir -p /config/radarr
+  chown -R abc:abc /config/radarr
+fi
diff --git a/sonarr/CHANGELOG.md b/sonarr/CHANGELOG.md
new file mode 100644
index 000000000..8d8de0155
--- /dev/null
+++ b/sonarr/CHANGELOG.md
@@ -0,0 +1,20 @@
+## 0.4.1
+
+ - Mount /media folder
+
+## 0.4.0
+
+ - Update sonarr to 2.0.0.5344 (linuxserver/sonarr:2.0.0.5344-ls53)
+
+## 0.3.0
+
+ - not a legacy addon anymore
+ - Update base image to linuxserver/sonarr:2.0.0.5338-ls50
+
+## 0.2.2
+
+ - set snapshot_exclude for logs and MediaCover
+ 
+ ## 0.2.0
+
+ - Update sonarr to 2.0.0.5338 (linuxserver/sonarr:2.0.0.5338-ls31)
\ No newline at end of file
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
new file mode 100644
index 000000000..6279396de
--- /dev/null
+++ b/sonarr/Dockerfile
@@ -0,0 +1,21 @@
+ARG BUILD_FROM
+# hadolint ignore=DL3006
+FROM $BUILD_FROM
+
+RUN 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/* 
+
+# use /data instead of /config for hass.io environment
+RUN sed -i "s|/config|/config/sonarr|g" /etc/services.d/sonarr/run \
+    && sed -i "s|/config|/config/sonarr|g" /etc/cont-init.d/30-config
+
+# copy local files
+COPY root/ /
diff --git a/sonarr/README.md b/sonarr/README.md
new file mode 100644
index 000000000..6127fbd9d
--- /dev/null
+++ b/sonarr/README.md
@@ -0,0 +1,27 @@
+# Hassio Add-ons by petersendev: Sonarr
+
+## About
+
+[Sonarr](https://sonarr.tv/) (formerly NZBdrone) is a PVR for usenet and bittorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-sonarr) 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>:8989`.
+
+
+[repository]: https://github.com/petersendev/hassio-addons
\ No newline at end of file
diff --git a/sonarr/build.json b/sonarr/build.json
new file mode 100644
index 000000000..eaa50ad3d
--- /dev/null
+++ b/sonarr/build.json
@@ -0,0 +1,13 @@
+{
+    "build_from_template": {
+        "image": "linuxserver/sonarr",
+        "version": "latest"
+    },
+    "build_from": {
+        "armhf": "linuxserver/sonarr:arm32v7-latest",
+        "aarch64": "linuxserver/sonarr:arm64v8-latest",
+        "amd64": "linuxserver/sonarr:amd64-latest"
+    },
+    "squash": false,
+    "args": {}
+}
diff --git a/sonarr/config.json b/sonarr/config.json
new file mode 100644
index 000000000..f4175fe0c
--- /dev/null
+++ b/sonarr/config.json
@@ -0,0 +1,47 @@
+{
+  "name": "sonarr",
+  "version": "0.4.1",
+  "slug": "sonarr",
+  "legacy": false,
+  "maintenance": {
+    "github_release": "https://github.com/linuxserver/docker-sonarr",
+    "version_regex": "(\\d+\\.\\d+\\.\\d+\\.\\d+)-(ls\\d+)"
+  },
+  "description": "PVR for usenet and bittorrent users",
+  "url": "https://github.com/petersendev/hassio-addons/tree/master/sonarr#readme",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armv7",
+    "armhf"
+  ],
+  "ports": {
+    "8989/tcp": 8989
+  },
+  "ports_description": {
+    "8989/tcp": "web interface"
+  },
+  "map": [
+    "config:rw",
+    "share:rw",
+    "media:rw",
+    "ssl"
+  ],
+  "webui": "http://[HOST]:[PORT:8989]",
+  "boot": "auto",
+  "options": {
+    "PUID": 1001,
+    "PGID": 1001
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int",
+    "TZ": "str?"
+  },
+  "snapshot_exclude": [
+    "**/Backups/*",
+    "**/logs/*",
+    "**/MediaCover/*"
+  ]
+}
diff --git a/sonarr/icon.png b/sonarr/icon.png
new file mode 100644
index 000000000..22932894e
Binary files /dev/null and b/sonarr/icon.png differ
diff --git a/sonarr/logo.png b/sonarr/logo.png
new file mode 100644
index 000000000..22932894e
Binary files /dev/null and b/sonarr/logo.png differ
diff --git a/sonarr/root/etc/cont-init.d/00-ha-env b/sonarr/root/etc/cont-init.d/00-ha-env
new file mode 100644
index 000000000..3b3e69246
--- /dev/null
+++ b/sonarr/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/sonarr/root/etc/cont-init.d/20-folders b/sonarr/root/etc/cont-init.d/20-folders
new file mode 100644
index 000000000..e612a4ac2
--- /dev/null
+++ b/sonarr/root/etc/cont-init.d/20-folders
@@ -0,0 +1,19 @@
+#!/usr/bin/with-contenv bash
+
+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/downloads ]; then
+  echo "Creating /share/downloads"
+  mkdir -p /share/downloads
+  chown -R abc:abc /share/downloads
+fi
+
+if [ ! -d /config/sonarr ]; then
+  echo "Creating /config/sonarr"
+  mkdir -p /config/sonarr
+  chown -R abc:abc /config/sonarr
+fi