diff --git a/README.md b/README.md
index 9ab587889..4b15e51ea 100644
--- a/README.md
+++ b/README.md
@@ -953,10 +953,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/c58ebb2
-[addon-doc-tasmoadmin]: https://github.com/hassio-addons/addon-tasmoadmin/blob/c58ebb2/README.md
+[addon-tasmoadmin]: https://github.com/hassio-addons/addon-tasmoadmin/tree/cf8b963
+[addon-doc-tasmoadmin]: https://github.com/hassio-addons/addon-tasmoadmin/blob/cf8b963/README.md
 [tasmoadmin-issue]: https://github.com/hassio-addons/addon-tasmoadmin/issues
-[tasmoadmin-version-shield]: https://img.shields.io/badge/version-c58ebb2-blue.svg
+[tasmoadmin-version-shield]: https://img.shields.io/badge/version-cf8b963-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 44ce3f841..52c6e605b 100644
--- a/tasmoadmin/CHANGELOG.md
+++ b/tasmoadmin/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Changelog since v0.15.1
+- ⬆️ Upgrades add-on base image to 10.2.2 (#220) 
+- Migrate JSON config to YAML (#219) 
 - Switch to centralized GitHub Action Workflows (#218) 
 - ⬆️ Upgrades php7 to 7.4.25-r0 (#217) 
 - ⬆️ Bump actions/checkout from 2.3.4 to 2.3.5 (#210)
diff --git a/tasmoadmin/README.md b/tasmoadmin/README.md
index 282bdd7a4..7bacda56e 100644
--- a/tasmoadmin/README.md
+++ b/tasmoadmin/README.md
@@ -53,6 +53,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-c58ebb2-blue.svg
-[release]: https://github.com/hassio-addons/addon-tasmoadmin/tree/c58ebb2
+[release-shield]: https://img.shields.io/badge/version-cf8b963-blue.svg
+[release]: https://github.com/hassio-addons/addon-tasmoadmin/tree/cf8b963
 [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 f25611d72..000000000
--- a/tasmoadmin/config.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "name": "TasmoAdmin",
-  "version": "c58ebb2",
-  "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 000000000..940a8aa14
--- /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: cf8b963
+webui: '[PROTO:ssl]://[HOST]:[PORT:9541]'