diff --git a/cec_scan/config.json b/cec_scan/config.json
index acf8ad1..b1bce47 100644
--- a/cec_scan/config.json
+++ b/cec_scan/config.json
@@ -4,10 +4,11 @@
   "slug": "cec_scan",
   "description": "Scan HDMI CEC devices",
   "url": "https://home-assistant.io/addons/cec_scan/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "once",
   "boot": "manual",
   "devices": [
-    "/dev/vchiq:/dev/vchiq:rwm"  
+    "/dev/vchiq:/dev/vchiq:rwm"
   ],
   "options": {},
   "schema": {},
diff --git a/check_config/config.json b/check_config/config.json
index 56d9873..8c3eb11 100644
--- a/check_config/config.json
+++ b/check_config/config.json
@@ -4,6 +4,7 @@
   "slug": "check_config",
   "description": "Check current Home Assistant configuration against a new version",
   "url": "https://home-assistant.io/addons/check_config/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "once",
   "boot": "manual",
   "map": ["config", "ssl"],
diff --git a/configurator/config.json b/configurator/config.json
index 8c4b5a7..0b6d373 100644
--- a/configurator/config.json
+++ b/configurator/config.json
@@ -4,6 +4,7 @@
   "slug": "configurator",
   "description": "Browser-based configuration file editor for Home Assistant.",
   "url": "https://home-assistant.io/addons/configurator",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "application",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:3218]",
   "homeassistant_api": true,
diff --git a/custom_deps/CHANGELOG.md b/custom_deps/CHANGELOG.md
deleted file mode 100644
index 4925c43..0000000
--- a/custom_deps/CHANGELOG.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Changelog
-
-## 1
-- Bug fix multiple pip packages v2
-
-## 0.3
-- Bug fix multiple pip packages
-
-## 0.2
-- Bug fix pip prefix settings
-
-## 0.1
-- Initial release
diff --git a/custom_deps/Dockerfile b/custom_deps/Dockerfile
deleted file mode 100644
index 9273f22..0000000
--- a/custom_deps/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-ARG BUILD_FROM
-FROM $BUILD_FROM
-
-# Add env
-ENV LANG C.UTF-8
-
-# Setup base
-RUN apk add --no-cache \
-    gcc g++ make cmake git
-
-# Copy data
-COPY run.sh /
-RUN chmod a+x /run.sh
-
-CMD [ "/run.sh" ]
diff --git a/custom_deps/build.json b/custom_deps/build.json
deleted file mode 100644
index a90fea1..0000000
--- a/custom_deps/build.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "build_from": {
-    "amd64": "homeassistant/amd64-base-python:3.6",
-    "i386": "homeassistant/i386-base-python:3.6",
-    "armhf": "homeassistant/armhf-base-python:3.6",
-    "aarch64": "homeassistant/aarch64-base-python:3.6"
-  }
-}
diff --git a/custom_deps/config.json b/custom_deps/config.json
deleted file mode 100644
index 9639e7f..0000000
--- a/custom_deps/config.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "Custom deps deployment",
-  "version": "1",
-  "slug": "custom_deps",
-  "description": "Manage custom python modules in Home Assistant deps",
-  "url": "https://home-assistant.io/addons/custom_deps/",
-  "startup": "once",
-  "boot": "manual",
-  "map": ["config:rw"],
-  "options": {
-    "pypi": [null],
-    "apk": []
-  },
-  "schema": {
-    "pypi": ["str"],
-    "apk": ["str"]
-  },
-  "image": "homeassistant/{arch}-addon-custom_deps"
-}
diff --git a/custom_deps/logo.png b/custom_deps/logo.png
deleted file mode 100644
index bbc2738..0000000
Binary files a/custom_deps/logo.png and /dev/null differ
diff --git a/custom_deps/run.sh b/custom_deps/run.sh
deleted file mode 100644
index a39c16c..0000000
--- a/custom_deps/run.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-
-CONFIG_PATH=/data/options.json
-
-PYPI="$(jq --raw-output '.pypi | join(" ")' ${CONFIG_PATH})"
-APK="$(jq --raw-output '.apk | join(" ") // empty' ${CONFIG_PATH})"
-
-# Cleanup old deps
-echo "[Info] Remove old deps"
-rm -rf /config/deps/*
-
-# Need custom apk for build?
-if [ -n "${APK}" ]; then
-    echo "[Info] Install apks for build"
-    # shellcheck disable=SC2086
-    if ! ERROR="$(apk add --no-cache ${APK})"; then
-        echo "[Error] Can't install packages!"
-        echo "${ERROR}" && exit 1
-    fi
-fi
-
-# Install pypi modules
-echo "[Info] Install pypi modules into deps"
-export PYTHONUSERBASE=/config/deps
-
-# shellcheck disable=SC2086
-if ! ERROR="$(pip3 install --user --no-cache-dir --prefix= --no-dependencies ${PYPI})"; then
-    echo "[Error] Can't install PyPI packages!"
-    echo "${ERROR}" && exit 1
-fi
-
-echo "[Info] done"
diff --git a/dhcp_server/config.json b/dhcp_server/config.json
index 68b35a3..2d23667 100644
--- a/dhcp_server/config.json
+++ b/dhcp_server/config.json
@@ -4,6 +4,7 @@
   "slug": "dhcp_server",
   "description": "A simple DHCP server",
   "url": "https://home-assistant.io/addons/dhcp_server/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "system",
   "boot": "auto",
   "host_network": true,
diff --git a/dnsmasq/config.json b/dnsmasq/config.json
index 863c43f..9ee1830 100644
--- a/dnsmasq/config.json
+++ b/dnsmasq/config.json
@@ -4,6 +4,7 @@
   "slug": "dnsmasq",
   "description": "A simple DNS server",
   "url": "https://home-assistant.io/addons/dnsmasq/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "system",
   "boot": "auto",
   "ports": {
diff --git a/duckdns/config.json b/duckdns/config.json
index 7a41370..44c871c 100644
--- a/duckdns/config.json
+++ b/duckdns/config.json
@@ -4,6 +4,7 @@
   "slug": "duckdns",
   "description": "Free Dynamic DNS (DynDNS or DDNS) service with Let's Encrypt support",
   "url": "https://www.home-assistant.io/addons/duckdns/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "auto",
   "map": ["ssl:rw"],
diff --git a/git_pull/config.json b/git_pull/config.json
index 89d19a2..7923b35 100644
--- a/git_pull/config.json
+++ b/git_pull/config.json
@@ -4,6 +4,7 @@
   "slug": "git_pull",
   "description": "Simple git pull to update the local configuration",
   "url": "https://home-assistant.io/addons/git_pull/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "manual",
   "hassio_api": true,
diff --git a/letsencrypt/config.json b/letsencrypt/config.json
index 184bf11..e0cd98e 100644
--- a/letsencrypt/config.json
+++ b/letsencrypt/config.json
@@ -4,6 +4,7 @@
   "slug": "letsencrypt",
   "description": "Manage certificate from Let's Encrypt",
   "url": "https://home-assistant.io/addons/lets_encrypt/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "once",
   "boot": "manual",
   "ports": {
diff --git a/mariadb/config.json b/mariadb/config.json
index 8a0eeee..960e956 100644
--- a/mariadb/config.json
+++ b/mariadb/config.json
@@ -4,6 +4,7 @@
   "slug": "mariadb",
   "description": "An SQL database server",
   "url": "https://home-assistant.io/addons/mariadb/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "system",
   "boot": "auto",
   "ports": {
diff --git a/mosquitto/config.json b/mosquitto/config.json
index 20ea181..1564bc8 100644
--- a/mosquitto/config.json
+++ b/mosquitto/config.json
@@ -4,6 +4,7 @@
   "slug": "mosquitto",
   "description": "An Open Source MQTT broker",
   "url": "https://home-assistant.io/addons/mosquitto/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "system",
   "boot": "auto",
   "map": ["ssl", "share"],
diff --git a/nginx_proxy/config.json b/nginx_proxy/config.json
index 95be1ed..bf1ff94 100644
--- a/nginx_proxy/config.json
+++ b/nginx_proxy/config.json
@@ -4,6 +4,7 @@
   "slug": "nginx_proxy",
   "description": "An SSL/TLS proxy",
   "url": "https://home-assistant.io/addons/nginx_proxy/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "application",
   "boot": "auto",
   "ports": {
diff --git a/rpc_shutdown/config.json b/rpc_shutdown/config.json
index ad76095..ce869e1 100644
--- a/rpc_shutdown/config.json
+++ b/rpc_shutdown/config.json
@@ -4,6 +4,7 @@
   "slug": "rpc_shutdown",
   "description": "Simple way for remote windows shutdowns",
   "url": "https://home-assistant.io/addons/rpc_shutdown/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "auto",
   "stdin": true,
diff --git a/samba/config.json b/samba/config.json
index 2cf0bb3..0863595 100644
--- a/samba/config.json
+++ b/samba/config.json
@@ -4,6 +4,7 @@
   "slug": "samba",
   "description": "Expose Hass.io folders with SMB/CIFS",
   "url": "https://home-assistant.io/addons/samba/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "auto",
   "host_network": true,
diff --git a/snips/config.json b/snips/config.json
index c659a4b..544140b 100644
--- a/snips/config.json
+++ b/snips/config.json
@@ -4,9 +4,9 @@
   "slug": "snips",
   "description": "Local voice control platform",
   "url": "https://home-assistant.io/addons/snips/",
+  "arch": ["armhf", "amd64"],
   "startup": "application",
   "boot": "auto",
-  "arch": ["armhf", "amd64"],
   "map": ["share"],
   "tmpfs": "size=10m",
   "audio": true,
diff --git a/ssh/config.json b/ssh/config.json
index 428f584..10d308a 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -4,6 +4,7 @@
   "slug": "ssh",
   "description": "Allows connections over SSH",
   "url": "https://home-assistant.io/addons/ssh/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "auto",
   "hassio_api": true,
diff --git a/tellstick/config.json b/tellstick/config.json
index 936593e..c83339b 100644
--- a/tellstick/config.json
+++ b/tellstick/config.json
@@ -4,6 +4,7 @@
   "slug": "tellstick",
   "description": "TellStick and TellStick Duo service.",
   "url": "https://home-assistant.io/addons/tellstick/",
+  "arch": ["armhf", "aarch64", "amd64", "i386"],
   "startup": "system",
   "stdin": true,
   "boot": "auto",