diff --git a/README.md b/README.md
index 04519066..2cd6b81d 100644
--- a/README.md
+++ b/README.md
@@ -930,10 +930,10 @@ SOFTWARE.
 [tailscale-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [tailscale-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [tailscale-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-tasmoadmin]: https://github.com/hassio-addons/addon-tasmoadmin/tree/v0.15.1
-[addon-doc-tasmoadmin]: https://github.com/hassio-addons/addon-tasmoadmin/blob/v0.15.1/README.md
+[addon-tasmoadmin]: https://github.com/hassio-addons/addon-tasmoadmin/tree/v0.16.0
+[addon-doc-tasmoadmin]: https://github.com/hassio-addons/addon-tasmoadmin/blob/v0.16.0/README.md
 [tasmoadmin-issue]: https://github.com/hassio-addons/addon-tasmoadmin/issues
-[tasmoadmin-version-shield]: https://img.shields.io/badge/version-v0.15.1-blue.svg
+[tasmoadmin-version-shield]: https://img.shields.io/badge/version-v0.16.0-blue.svg
 [tasmoadmin-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [tasmoadmin-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [tasmoadmin-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/tasmoadmin/CHANGELOG.md b/tasmoadmin/CHANGELOG.md
index 86225208..8b7e047f 100644
--- a/tasmoadmin/CHANGELOG.md
+++ b/tasmoadmin/CHANGELOG.md
@@ -1,13 +1,49 @@
 ## What’s changed
 
+## 🐛 Bug fixes
+
+- Fix SSL @subxero (#189)
+
+## 🚀 Enhancements
+
+- Migrate JSON config to YAML @frenck (#219)
+
+## 🧰 Maintenance
+
+- 🚀 Add-on CI improvements @frenck (#190)
+- ⬆️ Upgrade lock-threads workflow to 3.0.0 @frenck (#205)
+- Switch to centralized GitHub Action Workflows @frenck (#218)
+
+## 📚 Documentation
+
+- 🚑 Fix contributing link in readme @frenck (#191)
+
 ## ⬆️ Dependency updates
 
-- ⬆️ Bump docker/setup-buildx-action from v1.1.2 to v1.2.0 @dependabot (#152)
-- ⬆️ Bump docker/setup-qemu-action from v1.0.2 to v1.1.0 @dependabot (#151)
-- ⬆️ Bump docker/login-action from v1.8.0 to v1.9.0 @dependabot (#153)
-- ⬆️ Bump docker/setup-buildx-action from v1.2.0 to v1.3.0 @dependabot (#154)
-- ⬆️ Bump brpaz/hadolint-action from v1.4.0 to v1.5.0 @dependabot (#155)
-- ⬆️ Upgrades php7 to 7.4.19-r0 @frenck (#160)
-- ⬆️ Bump actions/stale from 3.0.18 to 3.0.19 @dependabot (#158)
-- ⬆️ Bump frenck/action-addon-information from 1.0.0 to 1.1 @dependabot (#161)
-- ⬆️ Bump micnncim/action-label-syncer from 1.2.0 to 1.3.0 @dependabot (#163)
+- ⬆️ Bump actions/cache from 2.1.5 to 2.1.6 @dependabot (#166)
+- ⬆️ Bump docker/build-push-action from 2.4.0 to 2.5.0 @dependabot (#165)
+- ⬆️ Bump docker/setup-qemu-action from 1.1.0 to 1.2.0 @dependabot (#164)
+- ⬆️ Upgrades add-on base image to v9.2.1 @frenck (#167)
+- ⬆️ Bump frenck/action-addon-information from 1.1 to 1.2.2 @dependabot (#169)
+- ⬆️ Bump docker/login-action from 1.9.0 to 1.10.0 @dependabot (#172)
+- ⬆️ Bump docker/build-push-action from 2.5.0 to 2.6.1 @dependabot (#176)
+- ⬆️ Bump docker/setup-buildx-action from 1.3.0 to 1.5.0 @dependabot (#177)
+- ⬆️ Upgrades add-on base image to v10.0.0 @frenck (#178)
+- ⬆️ Bump docker/setup-buildx-action from 1.5.0 to 1.5.1 @dependabot (#180)
+- ⬆️ Bump dessant/lock-threads from 2.0.3 to 2.1.1 @dependabot (#179)
+- ⬆️ Upgrades php7 to 7.4.21-r0 @frenck (#181)
+- ⬆️ Bump actions/stale from 3.0.19 to 4 @dependabot (#182)
+- ⬆️ Upgrades php7 to 7.4.22-r0 @frenck (#185)
+- ⬆️ Upgrades add-on base image to v10.0.1 @frenck (#186)
+- ⬆️ Bump dessant/lock-threads from 2.1.1 to 2.1.2 @dependabot (#192)
+- ⬆️ Bump docker/build-push-action from 2.6.1 to 2.7.0 @dependabot (#193)
+- ⬆️ Bump frenck/action-addon-linter from 2.2 to 2.3 @dependabot (#194)
+- ⬆️ Upgrades php7 to 7.4.24-r0 @frenck (#200)
+- ⬆️ Bump docker/setup-buildx-action from 1.5.1 to 1.6.0 @dependabot (#196)
+- ⬆️ Bump creyD/prettier_action from 3.3 to 4.0 @dependabot (#198)
+- ⬆️ Upgrades add-on base image to 10.1.0 @frenck (#201)
+- ⬆️ Bump frenck/action-addon-linter from 2.3 to 2.4.1 @dependabot (#204)
+- ⬆️ Upgrades add-on base image to 10.1.1 @frenck (#206)
+- ⬆️ Bump actions/checkout from 2.3.4 to 2.3.5 @dependabot (#210)
+- ⬆️ Upgrades php7 to 7.4.25-r0 @frenck (#217)
+- ⬆️ Upgrades add-on base image to 10.2.2 @frenck (#220)
diff --git a/tasmoadmin/README.md b/tasmoadmin/README.md
index 4a5e0f3c..733c3b14 100644
--- a/tasmoadmin/README.md
+++ b/tasmoadmin/README.md
@@ -50,6 +50,6 @@ If you are more interested in stable releases of our add-ons:
 [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-v0.15.1-blue.svg
-[release]: https://github.com/hassio-addons/addon-tasmoadmin/tree/v0.15.1
+[release-shield]: https://img.shields.io/badge/version-v0.16.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-tasmoadmin/tree/v0.16.0
 [screenshot]: https://github.com/hassio-addons/addon-tasmoadmin/raw/main/images/screenshot.png
\ No newline at end of file
diff --git a/tasmoadmin/config.json b/tasmoadmin/config.json
deleted file mode 100644
index 11dc3e18..00000000
--- a/tasmoadmin/config.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "name": "TasmoAdmin",
-  "version": "0.15.1",
-  "slug": "sonweb",
-  "description": "Centrally manage all your Sonoff-Tasmota devices",
-  "url": "https://github.com/hassio-addons/addon-tasmoadmin",
-  "webui": "[PROTO:ssl]://[HOST]:[PORT:9541]",
-  "startup": "system",
-  "init": false,
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7",
-    "i386"
-  ],
-  "map": [
-    "ssl"
-  ],
-  "ports": {
-    "9541/tcp": 9541
-  },
-  "ports_description": {
-    "9541/tcp": "TasmoAdmin web interface"
-  },
-  "options": {
-    "ssl": true,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem"
-  },
-  "schema": {
-    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
-    "ssl": "bool",
-    "certfile": "str",
-    "keyfile": "str"
-  },
-  "image": "ghcr.io/hassio-addons/tasmoadmin/{arch}"
-}
\ No newline at end of file
diff --git a/tasmoadmin/config.yaml b/tasmoadmin/config.yaml
new file mode 100644
index 00000000..1c863e15
--- /dev/null
+++ b/tasmoadmin/config.yaml
@@ -0,0 +1,30 @@
+arch:
+- aarch64
+- amd64
+- armhf
+- armv7
+- i386
+description: Centrally manage all your Sonoff-Tasmota devices
+image: ghcr.io/hassio-addons/tasmoadmin/{arch}
+init: false
+map:
+- ssl
+name: TasmoAdmin
+options:
+  certfile: fullchain.pem
+  keyfile: privkey.pem
+  ssl: true
+ports:
+  9541/tcp: 9541
+ports_description:
+  9541/tcp: TasmoAdmin web interface
+schema:
+  certfile: str
+  keyfile: str
+  log_level: list(trace|debug|info|notice|warning|error|fatal)?
+  ssl: bool
+slug: sonweb
+startup: system
+url: https://github.com/hassio-addons/addon-tasmoadmin
+version: 0.16.0
+webui: '[PROTO:ssl]://[HOST]:[PORT:9541]'