diff --git a/README.md b/README.md
index 76a12b0d1..b172705d3 100644
--- a/README.md
+++ b/README.md
@@ -971,10 +971,10 @@ SOFTWARE.
 [tautulli-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [tautulli-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [tautulli-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-thelounge]: https://github.com/hassio-addons/addon-thelounge/tree/db2a61c
-[addon-doc-thelounge]: https://github.com/hassio-addons/addon-thelounge/blob/db2a61c/README.md
+[addon-thelounge]: https://github.com/hassio-addons/addon-thelounge/tree/5c8a098
+[addon-doc-thelounge]: https://github.com/hassio-addons/addon-thelounge/blob/5c8a098/README.md
 [thelounge-issue]: https://github.com/hassio-addons/addon-thelounge/issues
-[thelounge-version-shield]: https://img.shields.io/badge/version-db2a61c-blue.svg
+[thelounge-version-shield]: https://img.shields.io/badge/version-5c8a098-blue.svg
 [thelounge-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [thelounge-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [thelounge-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/thelounge/CHANGELOG.md b/thelounge/CHANGELOG.md
index 159edd703..de73eec14 100644
--- a/thelounge/CHANGELOG.md
+++ b/thelounge/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Changelog since v0.12.3
+- Migrate JSON config to YAML (#95) 
 - Switch to centralized GitHub Action Workflows (#94) 
 - ⬆️ Upgrades nodejs to 14.18.1-r0 (#93) 
 - ⬆️ Bump actions/checkout from 2.3.4 to 2.3.5 (#89)
diff --git a/thelounge/README.md b/thelounge/README.md
index c0d648592..0baa35d8b 100644
--- a/thelounge/README.md
+++ b/thelounge/README.md
@@ -48,7 +48,7 @@ If you are more interested in stable releases of our add-ons:
 [midnight-theme]: https://raw.githubusercontent.com/timmo001/thelounge/master/docs/resources/midnight-theme.png
 [more-info-light]: https://raw.githubusercontent.com/timmo001/thelounge/master/docs/resources/more-info-light.png
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-db2a61c-blue.svg
-[release]: https://github.com/hassio-addons/addon-thelounge/tree/db2a61c
+[release-shield]: https://img.shields.io/badge/version-5c8a098-blue.svg
+[release]: https://github.com/hassio-addons/addon-thelounge/tree/5c8a098
 [screenshot]: https://raw.githubusercontent.com/hassio-addons/addon-thelounge/master/images/screenshot.png
 [thelounge]: https://github.com/timmo001/thelounge
\ No newline at end of file
diff --git a/thelounge/config.json b/thelounge/config.json
deleted file mode 100644
index e8f44e090..000000000
--- a/thelounge/config.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "name": "The Lounge",
-  "version": "db2a61c",
-  "slug": "thelounge",
-  "description": "A self-hosted web IRC client",
-  "url": "https://github.com/hassio-addons/addon-thelounge",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7",
-    "i386"
-  ],
-  "ingress": true,
-  "ingress_stream": true,
-  "panel_icon": "mdi:chat",
-  "ports": {
-    "80/tcp": null
-  },
-  "ports_description": {
-    "80/tcp": "The Lounge Web UI (Not required for Ingress)"
-  },
-  "map": [
-    "ssl"
-  ],
-  "options": {
-    "ssl": true,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem",
-    "default_theme": "default",
-    "themes": [
-      "thelounge-theme-solarized"
-    ],
-    "users": []
-  },
-  "schema": {
-    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
-    "ssl": "bool",
-    "certfile": "str",
-    "keyfile": "str",
-    "default_theme": "str",
-    "themes": [
-      "str"
-    ],
-    "users": [
-      "str"
-    ]
-  },
-  "image": "ghcr.io/hassio-addons/thelounge/{arch}"
-}
\ No newline at end of file
diff --git a/thelounge/config.yaml b/thelounge/config.yaml
new file mode 100644
index 000000000..dfdfe252f
--- /dev/null
+++ b/thelounge/config.yaml
@@ -0,0 +1,39 @@
+arch:
+- aarch64
+- amd64
+- armhf
+- armv7
+- i386
+description: A self-hosted web IRC client
+image: ghcr.io/hassio-addons/thelounge/{arch}
+ingress: true
+ingress_stream: true
+map:
+- ssl
+name: The Lounge
+options:
+  certfile: fullchain.pem
+  default_theme: default
+  keyfile: privkey.pem
+  ssl: true
+  themes:
+  - thelounge-theme-solarized
+  users: []
+panel_icon: mdi:chat
+ports:
+  80/tcp: null
+ports_description:
+  80/tcp: The Lounge Web UI (Not required for Ingress)
+schema:
+  certfile: str
+  default_theme: str
+  keyfile: str
+  log_level: list(trace|debug|info|notice|warning|error|fatal)?
+  ssl: bool
+  themes:
+  - str
+  users:
+  - str
+slug: thelounge
+url: https://github.com/hassio-addons/addon-thelounge
+version: 5c8a098