diff --git a/almond/CHANGELOG.md b/almond/CHANGELOG.md
index 41944ab..fa1b281 100644
--- a/almond/CHANGELOG.md
+++ b/almond/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.0
+
+- Restart nginx service on error
+- Use Alpine 3.13
+
 ## 1.0.1
 
 - Keep unzip dependency installed
diff --git a/almond/Dockerfile b/almond/Dockerfile
index edfac0e..2e52b2a 100644
--- a/almond/Dockerfile
+++ b/almond/Dockerfile
@@ -9,30 +9,29 @@ ENV \
 
 WORKDIR /opt/almond
 ARG ALMOND_VERSION
+
 RUN \
-    apt-get update \
-    && apt-get install -y --no-install-recommends \
-        build-essential \
-        git \
-        gnupg \
-        nginx \
-        python-dev \
-        software-properties-common \
-        unzip \
-    \
-    && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key \
-        | apt-key add - \
-    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg \
-        | apt-key add - \
-    && echo "deb https://deb.nodesource.com/node_12.x buster main" \
-        > /etc/apt/sources.list.d/nodesource.list \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" \
-        > /etc/apt/sources.list.d/yarn.list \
-    \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
+    set -x \
+    && apk add --no-cache \
         nodejs \
+        npm \
         yarn \
+        nginx \
+        unzip \
+        blas \
+        sqlite \
+        pkgconf \
+    && apk add --no-cache --virtual .build-dependencies \
+        build-base \
+        blas-dev \
+        git \
+        linux-headers \
+        sqlite-dev \
+        pkgconf-dev \
+        python3 \
+    \
+    && npm config set unsafe-perm \
+    && ln -s /usr/bin/python3 /usr/bin/python \
     \
     && git clone -b "${ALMOND_VERSION}" --depth 1 \
         "https://github.com/stanford-oval/almond-server" . \
@@ -48,23 +47,16 @@ RUN \
     && yarn global remove modclean \
     \
     && yarn cache clean \
-    && apt-get purge -y --auto-remove \
-        build-essential \
-        git \
-        gnupg \
-        python-dev \
-        software-properties-common \
-        yarn \
+    && apk del --no-cache \
+        .build-dependencies \
+    \
     && rm -rf \
         /opt/almond/.[!.]* \
         /root/.cache \
         /root/.config \
         /tmp/.[!.]* \
         /tmp/* \
-        /usr/lib/nginx \
         /usr/local/share/.cache \
-        /usr/local/share/.config \
-        /var/lib/apt/lists/* \
-        /var/www
+        /usr/local/share/.config
 
 COPY rootfs /
diff --git a/almond/build.json b/almond/build.json
index 4eaa2c0..1818b2f 100644
--- a/almond/build.json
+++ b/almond/build.json
@@ -1,8 +1,10 @@
 {
   "build_from": {
-    "aarch64": "homeassistant/aarch64-base-debian:buster",
-    "amd64": "homeassistant/amd64-base-debian:buster",
-    "armv7": "homeassistant/armv7-base-debian:buster"
+    "aarch64": "homeassistant/aarch64-base:3.13",
+    "amd64": "homeassistant/amd64-base:3.13",
+    "i386": "homeassistant/i386-base:3.13",
+    "armv7": "homeassistant/armv7-base:3.13",
+    "armhf": "homeassistant/armhf-base:3.13"
   },
   "args": {
     "ALMOND_VERSION": "v1.8.0"
diff --git a/almond/config.json b/almond/config.json
index 4e64a97..b1d36a2 100644
--- a/almond/config.json
+++ b/almond/config.json
@@ -1,15 +1,15 @@
 {
   "name": "Almond",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "slug": "almond",
   "description": "The home server version of Almond",
   "url": "https://github.com/home-assistant/hassio-addons/blob/master/almond",
-  "arch": ["armv7", "aarch64", "amd64"],
+  "arch": ["armv7", "armhf", "aarch64", "amd64", "i386"],
   "init": false,
   "discovery": ["almond"],
   "ingress": true,
   "panel_icon": "mdi:comment-eye-outline",
-  "homeassistant": "0.102.0.dev",
+  "homeassistant": "0.102.0",
   "homeassistant_api": true,
   "options": {},
   "schema": {},
diff --git a/almond/rootfs/etc/services.d/nginx/finish b/almond/rootfs/etc/services.d/nginx/finish
deleted file mode 100644
index a29ced9..0000000
--- a/almond/rootfs/etc/services.d/nginx/finish
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/execlineb -S1
-# ==============================================================================
-# Take down the S6 supervision tree based on service exit code
-# ==============================================================================
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 256 }
-
-s6-svscanctl -t /var/run/s6/services
diff --git a/deconz/CHANGELOG.md b/deconz/CHANGELOG.md
index 5642d9c..2960845 100644
--- a/deconz/CHANGELOG.md
+++ b/deconz/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.7.1
+
+- Restart nginx service on error
+
 ## 6.7.0
 
 - Bump deCONZ to 2.9.3
diff --git a/deconz/config.json b/deconz/config.json
index 94bf950..bb4f2ed 100644
--- a/deconz/config.json
+++ b/deconz/config.json
@@ -1,6 +1,6 @@
 {
   "name": "deCONZ",
-  "version": "6.7.0",
+  "version": "6.7.1",
   "slug": "deconz",
   "description": "Control a Zigbee network with ConBee or RaspBee by Dresden Elektronik",
   "arch": ["amd64", "armhf", "aarch64"],
diff --git a/deconz/rootfs/etc/services.d/nginx/finish b/deconz/rootfs/etc/services.d/nginx/finish
deleted file mode 100644
index a29ced9..0000000
--- a/deconz/rootfs/etc/services.d/nginx/finish
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/execlineb -S1
-# ==============================================================================
-# Take down the S6 supervision tree based on service exit code
-# ==============================================================================
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 256 }
-
-s6-svscanctl -t /var/run/s6/services
diff --git a/homematic/CHANGELOG.md b/homematic/CHANGELOG.md
index a8af2a0..d710450 100644
--- a/homematic/CHANGELOG.md
+++ b/homematic/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 11.2.1
+
+- Restart nginx service on error
+
 ## 11.2.0
 
 - Update OCCU to 3.55.10
diff --git a/homematic/config.json b/homematic/config.json
index 2b04c7b..175b136 100644
--- a/homematic/config.json
+++ b/homematic/config.json
@@ -1,6 +1,6 @@
 {
   "name": "HomeMatic CCU",
-  "version": "11.1.0",
+  "version": "11.1.1",
   "slug": "homematic",
   "description": "HomeMatic central based on OCCU",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/homematic",
diff --git a/homematic/rootfs/etc/services.d/nginx/finish b/homematic/rootfs/etc/services.d/nginx/finish
deleted file mode 100644
index a29ced9..0000000
--- a/homematic/rootfs/etc/services.d/nginx/finish
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/execlineb -S1
-# ==============================================================================
-# Take down the S6 supervision tree based on service exit code
-# ==============================================================================
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 256 }
-
-s6-svscanctl -t /var/run/s6/services
diff --git a/vlc/CHANGELOG.md b/vlc/CHANGELOG.md
index 931929c..29d8920 100644
--- a/vlc/CHANGELOG.md
+++ b/vlc/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.1
+
+- Restart nginx service on error
+
 ## 0.1.0
 
 - Inital release
diff --git a/vlc/config.json b/vlc/config.json
index be31bc3..b4f178b 100644
--- a/vlc/config.json
+++ b/vlc/config.json
@@ -1,6 +1,6 @@
 {
   "name": "VLC",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "slug": "vlc",
   "description": "Turn you device into a Media Player with VLC",
   "arch": ["amd64", "i386", "armv7", "aarch64"],
diff --git a/vlc/rootfs/etc/services.d/nginx/finish b/vlc/rootfs/etc/services.d/nginx/finish
deleted file mode 100644
index a29ced9..0000000
--- a/vlc/rootfs/etc/services.d/nginx/finish
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/execlineb -S1
-# ==============================================================================
-# Take down the S6 supervision tree based on service exit code
-# ==============================================================================
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 256 }
-
-s6-svscanctl -t /var/run/s6/services