diff --git a/README.md b/README.md
index b1b7e63a2..17c80c85b 100644
--- a/README.md
+++ b/README.md
@@ -980,10 +980,10 @@ SOFTWARE.
 [thelounge-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [thelounge-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [thelounge-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-tor]: https://github.com/hassio-addons/addon-tor/tree/3fc2cfe
-[addon-doc-tor]: https://github.com/hassio-addons/addon-tor/blob/3fc2cfe/README.md
+[addon-tor]: https://github.com/hassio-addons/addon-tor/tree/a0990f9
+[addon-doc-tor]: https://github.com/hassio-addons/addon-tor/blob/a0990f9/README.md
 [tor-issue]: https://github.com/hassio-addons/addon-tor/issues
-[tor-version-shield]: https://img.shields.io/badge/version-3fc2cfe-blue.svg
+[tor-version-shield]: https://img.shields.io/badge/version-a0990f9-blue.svg
 [tor-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [tor-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [tor-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/tor/CHANGELOG.md b/tor/CHANGELOG.md
index d115d5de3..0015ceed3 100644
--- a/tor/CHANGELOG.md
+++ b/tor/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Changelog since v3.0.5
+- ⬆️ Upgrades add-on base image to 10.2.1 (#117) 
+- Migrate JSON config to YAML (#116) 
 - Switch to centralized GitHub Action Workflows (#115) 
 - ⬆️ Bump actions/checkout from 2.3.4 to 2.3.5 (#106)
 
diff --git a/tor/README.md b/tor/README.md
index 4b1fa4e47..6de7865dc 100644
--- a/tor/README.md
+++ b/tor/README.md
@@ -61,6 +61,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-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-3fc2cfe-blue.svg
-[release]: https://github.com/hassio-addons/addon-tor/tree/3fc2cfe
+[release-shield]: https://img.shields.io/badge/version-a0990f9-blue.svg
+[release]: https://github.com/hassio-addons/addon-tor/tree/a0990f9
 [tor-hidden-service]: https://www.torproject.org/docs/hidden-services.html.en
\ No newline at end of file
diff --git a/tor/config.json b/tor/config.json
deleted file mode 100644
index 8295172f5..000000000
--- a/tor/config.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "name": "Tor",
-  "version": "3fc2cfe",
-  "slug": "tor",
-  "description": "Protect your privacy and access Home Assistant via Tor.",
-  "url": "https://github.com/hassio-addons/addon-tor",
-  "startup": "services",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7",
-    "i386"
-  ],
-  "init": false,
-  "ports": {
-    "9050/tcp": 9050
-  },
-  "ports_description": {
-    "9050/tcp": "Tor SOCKS proxy port"
-  },
-  "map": [
-    "ssl:rw"
-  ],
-  "options": {
-    "socks": false,
-    "hidden_services": true,
-    "stealth": false,
-    "client_names": [],
-    "ports": [
-      "8123"
-    ]
-  },
-  "schema": {
-    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
-    "socks": "bool",
-    "hidden_services": "bool",
-    "stealth": "bool",
-    "client_names": [
-      "match(^[A-Za-z0-9+-_]{1,16}$)"
-    ],
-    "ports": [
-      "match(^(.*:)?(?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])?$)"
-    ]
-  },
-  "image": "ghcr.io/hassio-addons/tor/{arch}"
-}
\ No newline at end of file
diff --git a/tor/config.yaml b/tor/config.yaml
new file mode 100644
index 000000000..bf93becf2
--- /dev/null
+++ b/tor/config.yaml
@@ -0,0 +1,36 @@
+arch:
+- aarch64
+- amd64
+- armhf
+- armv7
+- i386
+description: Protect your privacy and access Home Assistant via Tor.
+image: ghcr.io/hassio-addons/tor/{arch}
+init: false
+map:
+- ssl:rw
+name: Tor
+options:
+  client_names: []
+  hidden_services: true
+  ports:
+  - '8123'
+  socks: false
+  stealth: false
+ports:
+  9050/tcp: 9050
+ports_description:
+  9050/tcp: Tor SOCKS proxy port
+schema:
+  client_names:
+  - match(^[A-Za-z0-9+-_]{1,16}$)
+  hidden_services: bool
+  log_level: list(trace|debug|info|notice|warning|error|fatal)?
+  ports:
+  - match(^(.*:)?(?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])?$)
+  socks: bool
+  stealth: bool
+slug: tor
+startup: services
+url: https://github.com/hassio-addons/addon-tor
+version: a0990f9