diff --git a/jackett/build.json b/jackett/build.json
index 1a9489e3a..acd33e61d 100644
--- a/jackett/build.json
+++ b/jackett/build.json
@@ -5,6 +5,7 @@
     },
     "build_from": {
         "armhf": "linuxserver/jackett:arm32v7-latest",
+        "armv7": "linuxserver/jackett:arm32v7-latest",
         "aarch64": "linuxserver/jackett:arm64v8-latest",
         "amd64": "linuxserver/jackett:amd64-latest"
     },
diff --git a/jackett/config.json b/jackett/config.json
index b2cad1165..1ce05a51a 100644
--- a/jackett/config.json
+++ b/jackett/config.json
@@ -1,7 +1,7 @@
 {
   "name": "jackett",
   "version": "0.17.0",
-  "slug": "jackett",
+  "slug": "Jackett",
   "legacy": false,
   "maintenance": {
     "github_release": "https://github.com/linuxserver/docker-jackett",
@@ -41,6 +41,5 @@
   "environment": {
     "XDG_DATA_HOME": "/share/jackett",
     "XDG_CONFIG_HOME": "/config/jackett"
-  },
-  "image": "petersendev/hassio-jackett-{arch}"
+  }
 }
diff --git a/radarr/CHANGELOG.md b/radarr/CHANGELOG.md
deleted file mode 100644
index 17608c7cc..000000000
--- a/radarr/CHANGELOG.md
+++ /dev/null
@@ -1,27 +0,0 @@
-## 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
deleted file mode 100644
index f7425a738..000000000
--- a/radarr/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index d30b5c586..000000000
--- a/radarr/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
deleted file mode 100644
index 52253a465..000000000
--- a/radarr/build.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "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
deleted file mode 100644
index ab520648a..000000000
--- a/radarr/config.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "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
deleted file mode 100644
index 5e143b52e..000000000
Binary files a/radarr/icon.png and /dev/null differ
diff --git a/radarr/logo.png b/radarr/logo.png
deleted file mode 100644
index 5e143b52e..000000000
Binary files a/radarr/logo.png and /dev/null differ
diff --git a/radarr/root/etc/cont-init.d/00-ha-env b/radarr/root/etc/cont-init.d/00-ha-env
deleted file mode 100644
index 3b3e69246..000000000
--- a/radarr/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/radarr/root/etc/cont-init.d/20-folders b/radarr/root/etc/cont-init.d/20-folders
deleted file mode 100644
index 9fcadd756..000000000
--- a/radarr/root/etc/cont-init.d/20-folders
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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
deleted file mode 100644
index 8d8de0155..000000000
--- a/sonarr/CHANGELOG.md
+++ /dev/null
@@ -1,20 +0,0 @@
-## 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
deleted file mode 100644
index 6279396de..000000000
--- a/sonarr/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 6127fbd9d..000000000
--- a/sonarr/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
deleted file mode 100644
index eaa50ad3d..000000000
--- a/sonarr/build.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "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
deleted file mode 100644
index f4175fe0c..000000000
--- a/sonarr/config.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "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
deleted file mode 100644
index 22932894e..000000000
Binary files a/sonarr/icon.png and /dev/null differ
diff --git a/sonarr/logo.png b/sonarr/logo.png
deleted file mode 100644
index 22932894e..000000000
Binary files a/sonarr/logo.png and /dev/null differ
diff --git a/sonarr/root/etc/cont-init.d/00-ha-env b/sonarr/root/etc/cont-init.d/00-ha-env
deleted file mode 100644
index 3b3e69246..000000000
--- a/sonarr/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/sonarr/root/etc/cont-init.d/20-folders b/sonarr/root/etc/cont-init.d/20-folders
deleted file mode 100644
index e612a4ac2..000000000
--- a/sonarr/root/etc/cont-init.d/20-folders
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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