diff --git a/cec_scan/config.json b/cec_scan/config.json
index b1bce47..98b7d68 100644
--- a/cec_scan/config.json
+++ b/cec_scan/config.json
@@ -4,7 +4,7 @@
   "slug": "cec_scan",
   "description": "Scan HDMI CEC devices",
   "url": "https://home-assistant.io/addons/cec_scan/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "once",
   "boot": "manual",
   "devices": [
diff --git a/configurator/CHANGELOG.md b/configurator/CHANGELOG.md
index 4a685b0..a05370b 100644
--- a/configurator/CHANGELOG.md
+++ b/configurator/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
-## 2
+## 2.1
+- Update python version
+
+## 2.0
 - Add access to folder: `/share`, `/backup`
 
 ## 1.2
diff --git a/configurator/build.json b/configurator/build.json
index 402aa99..1a4c574 100644
--- a/configurator/build.json
+++ b/configurator/build.json
@@ -3,6 +3,7 @@
     "amd64": "homeassistant/amd64-base-python:3.6",
     "i386": "homeassistant/i386-base-python:3.6",
     "armhf": "homeassistant/armhf-base-python:3.6",
+    "armv7": "homeassistant/armv7-base-python:3.6",
     "aarch64": "homeassistant/aarch64-base-python:3.6"
   },
   "args": {
diff --git a/configurator/config.json b/configurator/config.json
index 0b6d373..ff6008c 100644
--- a/configurator/config.json
+++ b/configurator/config.json
@@ -1,10 +1,10 @@
 {
   "name": "Configurator",
-  "version": "2",
+  "version": "2.1",
   "slug": "configurator",
   "description": "Browser-based configuration file editor for Home Assistant.",
   "url": "https://home-assistant.io/addons/configurator",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "application",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:3218]",
   "homeassistant_api": true,
diff --git a/dhcp_server/CHANGELOG.md b/dhcp_server/CHANGELOG.md
new file mode 100644
index 0000000..5952f70
--- /dev/null
+++ b/dhcp_server/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Changelog
+
+## 1.0
+- Update DHCP to 4.4.1
diff --git a/dhcp_server/Dockerfile b/dhcp_server/Dockerfile
index 1105ba0..a028f73 100644
--- a/dhcp_server/Dockerfile
+++ b/dhcp_server/Dockerfile
@@ -5,7 +5,7 @@ FROM $BUILD_FROM
 ENV LANG C.UTF-8
 
 # Setup base
-RUN apk add --no-cache tzdata jq dhcp
+RUN apk add --no-cache dhcp
 
 # Copy data
 COPY run.sh /
diff --git a/dhcp_server/config.json b/dhcp_server/config.json
index 2d23667..279d95c 100644
--- a/dhcp_server/config.json
+++ b/dhcp_server/config.json
@@ -1,10 +1,10 @@
 {
   "name": "DHCP server",
-  "version": "0.4",
+  "version": "1.0",
   "slug": "dhcp_server",
   "description": "A simple DHCP server",
   "url": "https://home-assistant.io/addons/dhcp_server/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "system",
   "boot": "auto",
   "host_network": true,
diff --git a/dnsmasq/CHANGELOG.md b/dnsmasq/CHANGELOG.md
index e22084f..d0177e2 100644
--- a/dnsmasq/CHANGELOG.md
+++ b/dnsmasq/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
 
+## 1.2
+- Update DNSmasq 2.80
+
 ## 1.1
 - Add AppArmor profile
diff --git a/dnsmasq/Dockerfile b/dnsmasq/Dockerfile
index a69cdf8..ed4c930 100644
--- a/dnsmasq/Dockerfile
+++ b/dnsmasq/Dockerfile
@@ -5,7 +5,7 @@ FROM $BUILD_FROM
 ENV LANG C.UTF-8
 
 # Setup base
-RUN apk add --no-cache jq dnsmasq
+RUN apk add --no-cache dnsmasq
 
 # Copy data
 COPY run.sh /
diff --git a/dnsmasq/config.json b/dnsmasq/config.json
index 9ee1830..fe9e886 100644
--- a/dnsmasq/config.json
+++ b/dnsmasq/config.json
@@ -1,10 +1,10 @@
 {
   "name": "Dnsmasq",
-  "version": "1.1",
+  "version": "1.2",
   "slug": "dnsmasq",
   "description": "A simple DNS server",
   "url": "https://home-assistant.io/addons/dnsmasq/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "system",
   "boot": "auto",
   "ports": {
diff --git a/duckdns/CHANGELOG.md b/duckdns/CHANGELOG.md
index f5b965d..4360705 100644
--- a/duckdns/CHANGELOG.md
+++ b/duckdns/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.6
+- Update Alpine images / OpenSSL
+
 ## 1.5
 - Fix bug with multible domains for Let's encrypt
 
diff --git a/duckdns/Dockerfile b/duckdns/Dockerfile
index 18d1aa1..4481431 100644
--- a/duckdns/Dockerfile
+++ b/duckdns/Dockerfile
@@ -6,7 +6,7 @@ ENV LANG C.UTF-8
 
 # Setup base
 ARG DEHYDRATED_VERSION
-RUN apk add --no-cache jq curl libressl \
+RUN apk add --no-cache curl openssl \
   && curl -s -o /usr/bin/dehydrated https://raw.githubusercontent.com/lukas2511/dehydrated/v$DEHYDRATED_VERSION/dehydrated \
   && chmod a+x /usr/bin/dehydrated
 
diff --git a/duckdns/config.json b/duckdns/config.json
index 44c871c..612022b 100644
--- a/duckdns/config.json
+++ b/duckdns/config.json
@@ -1,10 +1,10 @@
 {
   "name": "Duck DNS",
-  "version": "1.5",
+  "version": "1.6",
   "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"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "auto",
   "map": ["ssl:rw"],
diff --git a/git_pull/config.json b/git_pull/config.json
index 7923b35..31fb16b 100644
--- a/git_pull/config.json
+++ b/git_pull/config.json
@@ -4,7 +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"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "manual",
   "hassio_api": true,
diff --git a/google_assistant/CHANGELOG.md b/google_assistant/CHANGELOG.md
index ae0d046..5836d2d 100644
--- a/google_assistant/CHANGELOG.md
+++ b/google_assistant/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.2
+- Use homeassistant ubuntu base images
+
 ## 2.1
 - Add error handling for decoding UTF-8
 
diff --git a/google_assistant/build.json b/google_assistant/build.json
index 67c2c9d..3275b63 100644
--- a/google_assistant/build.json
+++ b/google_assistant/build.json
@@ -1,6 +1,6 @@
 {
   "build_from": {
-    "armhf": "multiarch/debian-debootstrap:armhf-stretch",
-    "amd64": "multiarch/debian-debootstrap:amd64-stretch"
+    "armv7": "homeassistant/armv7-base-ubuntu:18.04",
+    "amd64": "homeassistant/amd64-base-ubuntu:18.04"
   }
 }
diff --git a/google_assistant/config.json b/google_assistant/config.json
index 92b1db8..b0cdbf2 100644
--- a/google_assistant/config.json
+++ b/google_assistant/config.json
@@ -1,12 +1,12 @@
 {
   "name": "Google Assistant SDK",
-  "version": "2.1",
+  "version": "2.2",
   "slug": "google_assistant",
   "description": "A virtual personal assistant developed by Google",
   "url": "https://home-assistant.io/addons/google_assistant/",
   "startup": "application",
   "boot": "auto",
-  "arch": ["armhf", "amd64"],
+  "arch": ["armv7", "amd64"],
   "map": ["share"],
   "audio": true,
   "ports": {
diff --git a/letsencrypt/CHANGELOG.md b/letsencrypt/CHANGELOG.md
index fb9a4dd..e34b5ea 100644
--- a/letsencrypt/CHANGELOG.md
+++ b/letsencrypt/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.3
+- Update certbot to 0.30.2
+
 ## 2.2
 - Bugfix not exists jq
 
diff --git a/letsencrypt/Dockerfile b/letsencrypt/Dockerfile
index e9e514a..0280ebb 100644
--- a/letsencrypt/Dockerfile
+++ b/letsencrypt/Dockerfile
@@ -5,7 +5,7 @@ FROM $BUILD_FROM
 ENV LANG C.UTF-8
 
 # Setup base
-RUN apk add --no-cache jq certbot py2-future
+RUN apk add --no-cache certbot
 
 # Copy data
 COPY run.sh /
diff --git a/letsencrypt/config.json b/letsencrypt/config.json
index e0cd98e..acdc387 100644
--- a/letsencrypt/config.json
+++ b/letsencrypt/config.json
@@ -1,10 +1,10 @@
 {
   "name": "Let's Encrypt",
-  "version": "2.2",
+  "version": "2.3",
   "slug": "letsencrypt",
   "description": "Manage certificate from Let's Encrypt",
   "url": "https://home-assistant.io/addons/lets_encrypt/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "once",
   "boot": "manual",
   "ports": {
diff --git a/mariadb/CHANGELOG.md b/mariadb/CHANGELOG.md
new file mode 100644
index 0000000..a384b97
--- /dev/null
+++ b/mariadb/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Changelog
+
+## 1.0
+- Update MariaDB to 10.3.13
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index 7543f65..c7e9a96 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -5,7 +5,7 @@ FROM $BUILD_FROM
 ENV LANG C.UTF-8
 
 # Setup base
-RUN apk add --no-cache jq mariadb mariadb-client
+RUN apk add --no-cache mariadb mariadb-client
 
 # Copy data
 COPY run.sh /
diff --git a/mariadb/config.json b/mariadb/config.json
index 960e956..80f5f23 100644
--- a/mariadb/config.json
+++ b/mariadb/config.json
@@ -1,10 +1,10 @@
 {
   "name": "MariaDB",
-  "version": "0.2",
+  "version": "1.0",
   "slug": "mariadb",
   "description": "An SQL database server",
   "url": "https://home-assistant.io/addons/mariadb/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "system",
   "boot": "auto",
   "ports": {
diff --git a/mosquitto/CHANGELOG.md b/mosquitto/CHANGELOG.md
index f4f3717..cf5a802 100644
--- a/mosquitto/CHANGELOG.md
+++ b/mosquitto/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.1
+- Update mosquitto 1.5.6
+
 ## 4.0
 - Use Alpine 3.7 because libwebsocket 3.0.0 is broken on Alpine 3.8
 
diff --git a/mosquitto/build.json b/mosquitto/build.json
index 3dd2c62..0356414 100644
--- a/mosquitto/build.json
+++ b/mosquitto/build.json
@@ -1,10 +1,4 @@
 {
-  "build_from": {
-    "amd64": "homeassistant/amd64-base:3.7",
-    "i386": "homeassistant/i386-base:3.7",
-    "armhf": "homeassistant/armhf-base:3.7",
-    "aarch64": "homeassistant/aarch64-base:3.7"
-  },
   "args": {
     "MOSQUITTO_AUTH_VERSION": "0.1.3"
   }
diff --git a/mosquitto/config.json b/mosquitto/config.json
index 1564bc8..8ce707a 100644
--- a/mosquitto/config.json
+++ b/mosquitto/config.json
@@ -1,10 +1,10 @@
 {
   "name": "Mosquitto broker",
-  "version": "4",
+  "version": "4.1",
   "slug": "mosquitto",
   "description": "An Open Source MQTT broker",
   "url": "https://home-assistant.io/addons/mosquitto/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "system",
   "boot": "auto",
   "map": ["ssl", "share"],
diff --git a/nginx_proxy/CHANGELOG.md b/nginx_proxy/CHANGELOG.md
index eaea45a..bbf96d3 100644
--- a/nginx_proxy/CHANGELOG.md
+++ b/nginx_proxy/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.1
+- Update nginx to version 1.14.2
+
 ## 2.0
 - Update nginx to version 1.14.0
 
diff --git a/nginx_proxy/Dockerfile b/nginx_proxy/Dockerfile
index fd51076..20ed398 100644
--- a/nginx_proxy/Dockerfile
+++ b/nginx_proxy/Dockerfile
@@ -5,7 +5,7 @@ FROM $BUILD_FROM
 ENV LANG C.UTF-8
 
 # Setup base
-RUN apk add --no-cache nginx libressl
+RUN apk add --no-cache nginx openssl
 
 # Copy data
 COPY run.sh /
diff --git a/nginx_proxy/config.json b/nginx_proxy/config.json
index bf1ff94..7504546 100644
--- a/nginx_proxy/config.json
+++ b/nginx_proxy/config.json
@@ -1,10 +1,10 @@
 {
   "name": "NGINX Home Assistant SSL proxy",
-  "version": "2",
+  "version": "2.1",
   "slug": "nginx_proxy",
   "description": "An SSL/TLS proxy",
   "url": "https://home-assistant.io/addons/nginx_proxy/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "application",
   "boot": "auto",
   "ports": {
diff --git a/rpc_shutdown/CHANGELOG.md b/rpc_shutdown/CHANGELOG.md
new file mode 100644
index 0000000..58925db
--- /dev/null
+++ b/rpc_shutdown/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Changelog
+
+## 1.0
+- Update samba 4.8.8
diff --git a/rpc_shutdown/Dockerfile b/rpc_shutdown/Dockerfile
index 87c841b..65ded60 100644
--- a/rpc_shutdown/Dockerfile
+++ b/rpc_shutdown/Dockerfile
@@ -5,7 +5,7 @@ FROM $BUILD_FROM
 ENV LANG C.UTF-8
 
 # Setup base
-RUN apk add --no-cache jq samba-common-tools samba-common
+RUN apk add --no-cache samba-common-tools samba-common
 
 # Copy data
 COPY run.sh /
diff --git a/rpc_shutdown/config.json b/rpc_shutdown/config.json
index ce869e1..2bb32f3 100644
--- a/rpc_shutdown/config.json
+++ b/rpc_shutdown/config.json
@@ -1,10 +1,10 @@
 {
   "name": "RPC Shutdown",
-  "version": "0.3",
+  "version": "1.0",
   "slug": "rpc_shutdown",
   "description": "Simple way for remote windows shutdowns",
   "url": "https://home-assistant.io/addons/rpc_shutdown/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "auto",
   "stdin": true,
diff --git a/samba/CHANGELOG.md b/samba/CHANGELOG.md
index 23754fc..607ff1f 100644
--- a/samba/CHANGELOG.md
+++ b/samba/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 8.1
+- Update Samba to version 4.8.8
+
 ## 8.0
 - Fix access to /backup
 
diff --git a/samba/Dockerfile b/samba/Dockerfile
index c4eceb6..b2148ad 100644
--- a/samba/Dockerfile
+++ b/samba/Dockerfile
@@ -6,7 +6,7 @@ ENV LANG C.UTF-8
 
 # Setup base
 RUN apk add --no-cache \
-        socat curl samba-server samba-common-tools
+        curl samba-server samba-common-tools
 
 # Copy data
 COPY run.sh /
diff --git a/samba/config.json b/samba/config.json
index 0863595..5fa7723 100644
--- a/samba/config.json
+++ b/samba/config.json
@@ -1,10 +1,10 @@
 {
   "name": "Samba share",
-  "version": "8",
+  "version": "8.1",
   "slug": "samba",
   "description": "Expose Hass.io folders with SMB/CIFS",
   "url": "https://home-assistant.io/addons/samba/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "auto",
   "host_network": true,
diff --git a/ssh/config.json b/ssh/config.json
index 10d308a..de25263 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -4,7 +4,7 @@
   "slug": "ssh",
   "description": "Allows connections over SSH",
   "url": "https://home-assistant.io/addons/ssh/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "services",
   "boot": "auto",
   "hassio_api": true,
diff --git a/tellstick/CHANGELOG.md b/tellstick/CHANGELOG.md
index 8b733c6..5e53003 100644
--- a/tellstick/CHANGELOG.md
+++ b/tellstick/CHANGELOG.md
@@ -1,7 +1,10 @@
 # Changelog
 
+## 1.0
+- Update base image
+
 ## 0.5
-- Added possibility for config options:  
-protocols: comen, fineoffset, mandolyn, oregon  
-models: temperature, temperaturehumidity  
+- Added possibility for config options:
+protocols: comen, fineoffset, mandolyn, oregon
+models: temperature, temperaturehumidity
 - Created changelog
diff --git a/tellstick/Dockerfile b/tellstick/Dockerfile
index 646fcde..a301a77 100644
--- a/tellstick/Dockerfile
+++ b/tellstick/Dockerfile
@@ -5,7 +5,7 @@ ENV LANG C.UTF-8
 
 # Install Telldus library for TellStick (using same approach as in hassio docker installation)
 RUN apk add --no-cache \
-        confuse libftdi1 libstdc++ jq socat \
+        confuse libftdi1 libstdc++ socat \
     && apk add --no-cache --virtual .build-dependencies \
         cmake build-base gcc doxygen confuse-dev argp-standalone libftdi1-dev git \
     && ln -s /usr/include/libftdi1/ftdi.h /usr/include/ftdi.h \
diff --git a/tellstick/config.json b/tellstick/config.json
index c83339b..c43dfa7 100644
--- a/tellstick/config.json
+++ b/tellstick/config.json
@@ -1,10 +1,10 @@
 {
   "name": "TellStick",
-  "version": "0.5",
+  "version": "1.0",
   "slug": "tellstick",
   "description": "TellStick and TellStick Duo service.",
   "url": "https://home-assistant.io/addons/tellstick/",
-  "arch": ["armhf", "aarch64", "amd64", "i386"],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "system",
   "stdin": true,
   "boot": "auto",