diff --git a/musicbrainz/Dockerfile b/musicbrainz/Dockerfile
deleted file mode 100644
index 374b6bf2f..000000000
--- a/musicbrainz/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-ARG BUILD_FROM
-# hadolint ignore=DL3006
-FROM $BUILD_FROM
-
-# Set shell
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# copy local files
-COPY root/ /
-
-RUN sed -i "s|/config|/musicbrainz|g" /etc/services.d/server/run
-
diff --git a/musicbrainz/README.md b/musicbrainz/README.md
deleted file mode 100644
index 0eb7ee096..000000000
--- a/musicbrainz/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Hassio Add-ons by alexbelgium: musicbrainz
-
-## About
-
-[musicbrainz](https://musicbrainz.org/) is an open music encyclopedia that collects music metadata and makes it available to the public.
-
-This addon is based on the [docker image](https://github.com/linuxserver/docker-musicbrainz) 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. The initial import and setup of the database can take quite a long time, dependant on your download speed etc, be patient and don't restart the container before it's complete.
-1. Check the logs of the add-on to see if everything went well.
-1. You must register here to receive a MusicBrainz code to allow you to receive database updates, it is free. Get Code [here] (https://metabrainz.org/supporters/account-type).
-
-
-## Configuration
-
-Webui can be found at `<your-ip>:5000`.
-
-[repository]: https://github.com/alexbelgium/hassio-addons
diff --git a/musicbrainz/build.json b/musicbrainz/build.json
deleted file mode 100644
index 2afee8deb..000000000
--- a/musicbrainz/build.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "build_from": {
-        "armv7": "linuxserver/musicbrainz:arm32v7-latest",
-        "armhf": "linuxserver/musicbrainz:arm32v7-latest",
-        "aarch64": "linuxserver/musicbrainz:arm64v8-latest",
-        "amd64": "linuxserver/musicbrainz:amd64-latest"
-    },
-    "squash": false,
-    "args": {}
-}
diff --git a/musicbrainz/config.json b/musicbrainz/config.json
deleted file mode 100644
index cb921e01c..000000000
--- a/musicbrainz/config.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "name": "musicbrainz with smb and hdd (test)",
-  "version": "1.0",
-  "slug": "musicbrainz_nas_test",
-  "legacy": false,
-  "maintenance": {
-    "github_release": "https://github.com/linuxserver/docker-musicbrainz",
-    "version_regex": "(\\d+\\.\\d+\\.\\d+.\\d+)-(ls\\d+)"
-  },
-  "description": "A free open music encyclopedia that collects music metadata and makes it available to the public.",
-  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/musicbrainz#readme",
-  "startup": "services",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7"
-  ],
-  "ports": {
-    "5000/tcp": 5000  },
-  "ports_description": {
-    "5000/tcp": "web interface"
-  },
-  "map": [
-    "config:rw",
-    "share:rw",
-    "media:rw"
-  ],
-  "webui": "http://[HOST]:[PORT:5000]",
-  "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/musicbrainz/icon.png b/musicbrainz/icon.png
deleted file mode 100644
index fe71933da..000000000
Binary files a/musicbrainz/icon.png and /dev/null differ
diff --git a/musicbrainz/logo.png b/musicbrainz/logo.png
deleted file mode 100644
index fe71933da..000000000
Binary files a/musicbrainz/logo.png and /dev/null differ
diff --git a/musicbrainz/root/etc/cont-init.d/00-ha-env b/musicbrainz/root/etc/cont-init.d/00-ha-env
deleted file mode 100644
index 3b3e69246..000000000
--- a/musicbrainz/root/etc/cont-init.d/00-ha-env
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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/musicbrainz/root/etc/cont-init.d/50-mounts b/musicbrainz/root/etc/cont-init.d/50-mounts
deleted file mode 100644
index ab6c54ec2..000000000
--- a/musicbrainz/root/etc/cont-init.d/50-mounts
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/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
diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
deleted file mode 100644
index 90c92f648..000000000
--- a/qbittorrent/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-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|/qbittorrent|g" /etc/services.d/qbittorrent/run \
-    && sed -i "s|/config|/qbittorrent|g" /etc/cont-init.d/30-config
-
diff --git a/qbittorrent/README.md b/qbittorrent/README.md
deleted file mode 100644
index d39acb785..000000000
--- a/qbittorrent/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Hassio Add-ons by alexbelgium: qbittorrent
-
-## About
-
-[qbittorrent](https://qbittorrent.media/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.
-
-This addon is based on the [docker image](https://github.com/linuxserver/docker-qbittorrent) 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/qbittorrent/build.json b/qbittorrent/build.json
deleted file mode 100644
index c9b124c10..000000000
--- a/qbittorrent/build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "build_from_template": {
-        "image": "linuxserver/qbittorrent",
-        "version": "beta"
-    },
-    "build_from": {
-        "armv7": "linuxserver/qbittorrent:arm32v7-beta",
-        "armhf": "linuxserver/qbittorrent:arm32v7-beta",
-        "aarch64": "linuxserver/qbittorrent:arm64v8-beta",
-        "amd64": "linuxserver/qbittorrent:amd64-beta"
-    },
-    "squash": false,
-    "args": {}
-}
diff --git a/qbittorrent/config.json b/qbittorrent/config.json
deleted file mode 100644
index 0275d019c..000000000
--- a/qbittorrent/config.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "name": "qbittorrent beta with smb and hdd",
-  "version": "1.0",
-  "slug": "qbittorrent_nas",
-  "legacy": false,
-  "maintenance": {
-    "github_release": "https://github.com/linuxserver/docker-qbittorrent",
-    "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/alexbelgium/hassio-addons/tree/master/qbittorrent#readme",
-  "startup": "services",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
-  ],
-  "ports": {
-    "8080/tcp": 8080  },
-  "ports_description": {
-    "8080/tcp": "web interface"
-  },
-  "map": [
-    "config:rw",
-    "share:rw",
-    "media:rw",
-    "ssl"
-  ],
-  "webui": "http://[HOST]:[PORT:8080]",
-  "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/qbittorrent/icon.png b/qbittorrent/icon.png
deleted file mode 100644
index fe71933da..000000000
Binary files a/qbittorrent/icon.png and /dev/null differ
diff --git a/qbittorrent/logo.png b/qbittorrent/logo.png
deleted file mode 100644
index fe71933da..000000000
Binary files a/qbittorrent/logo.png and /dev/null differ
diff --git a/qbittorrent/root/etc/cont-init.d/00-ha-env b/qbittorrent/root/etc/cont-init.d/00-ha-env
deleted file mode 100644
index 3b3e69246..000000000
--- a/qbittorrent/root/etc/cont-init.d/00-ha-env
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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/qbittorrent/root/etc/cont-init.d/20-folders b/qbittorrent/root/etc/cont-init.d/20-folders
deleted file mode 100644
index b5a4b3649..000000000
--- a/qbittorrent/root/etc/cont-init.d/20-folders
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ ! -d /emby ]; then
-  echo "Creating /emby"
-  mkdir -p /emby
-  chown -R abc:abc /emby
-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/qbittorrent/root/etc/cont-init.d/50-mounts b/qbittorrent/root/etc/cont-init.d/50-mounts
deleted file mode 100644
index ab6c54ec2..000000000
--- a/qbittorrent/root/etc/cont-init.d/50-mounts
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/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