diff --git a/README.md b/README.md
index c2de572c..8a4502bd 100644
--- a/README.md
+++ b/README.md
@@ -936,10 +936,10 @@ SOFTWARE.
 [mqtt-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [mqtt-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [mqtt-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-matrix]: https://github.com/hassio-addons/addon-matrix/tree/v0.8.0
-[addon-doc-matrix]: https://github.com/hassio-addons/addon-matrix/blob/v0.8.0/README.md
+[addon-matrix]: https://github.com/hassio-addons/addon-matrix/tree/v0.9.0
+[addon-doc-matrix]: https://github.com/hassio-addons/addon-matrix/blob/v0.9.0/README.md
 [matrix-issue]: https://github.com/hassio-addons/addon-matrix/issues
-[matrix-version-shield]: https://img.shields.io/badge/version-v0.8.0-blue.svg
+[matrix-version-shield]: https://img.shields.io/badge/version-v0.9.0-blue.svg
 [matrix-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/matrix-armhf.svg
 [matrix-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [matrix-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/matrix/CHANGELOG.md b/matrix/CHANGELOG.md
index 63c3b093..e3eafd13 100644
--- a/matrix/CHANGELOG.md
+++ b/matrix/CHANGELOG.md
@@ -2,30 +2,18 @@
 
 ## Changes
 
-- :fireworks: Updates maintenance/license year to 2020
-- :pencil2: Fixes some spelling and grammar
-- :arrow_up: Upgrades add-on base image to v4.0.0
-- :arrow_up: Upgrades musl-dev to 1.1.24-r0
-- :arrow_up: Upgrades postgresql-dev to 12.1-r0
-- :arrow_up: Upgrades zlib-dev to 1.2.11-r3
-- :arrow_up: Upgrades libressl to 3.0.2-r0
-- :arrow_up: Upgrades libxslt to 1.1.34-r0
-- :arrow_up: Upgrades nginx to 1.16.1-r4
-- :arrow_up: Upgrades su-exec to 0.2-r1
-- :arrow_up: Upgrades tiff to 4.1.0-r0
-- :arrow_up: Upgrades libpq to 12.1-r0
-- :arrow_up: Upgrades zlib to 1.2.11-r3
-- :arrow_up: Upgrades lua-resty-http to 0.15-r0
-- :hammer: Update Hass.io wheels for Alpine 3.11
-- :arrow_up: Upgrades Riot to v1.5.6
-- :arrow_up: Upgrades libjpeg-turbo to 2.0.4-r0
-- :arrow_up: Updates pysaml2 to v5 (#42)
-- :arrow_up: Updates matrix-synapse to v1.9.0 (#43)
-- :arrow_up: Upgrades nginx to 1.16.1-r6
-- :arrow_up: Upgrades riot-web to v1.5.7
+- :books: Update add-on documentation to use new YAML configuration format
+- :hammer: Re-branding
+- :hammer: Update add-on config with new password & list features
+- :hammer: Updates for upstream Supervisor changes
+- :arrow_up: Upgrades postgresql-dev to 12.2-r0
+- :arrow_up: Upgrades libpq to 12.2-r0
+- :arrow_up: Upgrades riot-web to v1.5.10
+- :arrow_up: Updates matrix-synapse to v1.11.0 (#45)
+- :arrow_up: Upgrades add-on base image to v5.0.2
 
 [Full Changelog][changelog]
 
-[changelog]: https://github.com/hassio-addons/addon-matrix/compare/v0.7.4...v0.8.0
-[gitlabci-shield]: https://gitlab.com/hassio-addons/addon-matrix/badges/v0.8.0/pipeline.svg
+[changelog]: https://github.com/hassio-addons/addon-matrix/compare/v0.8.0...v0.9.0
+[gitlabci-shield]: https://gitlab.com/hassio-addons/addon-matrix/badges/v0.9.0/pipeline.svg
 [gitlabci]: https://gitlab.com/hassio-addons/addon-matrix/pipelines
diff --git a/matrix/README.md b/matrix/README.md
index 67d40da2..4d2f90f8 100644
--- a/matrix/README.md
+++ b/matrix/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Matrix
+# Home Assistant Community Add-on: Matrix
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -21,7 +21,7 @@ Matrix is a secure and decentralized communication platform served as an
 
 ## WARNING! THIS IS A BETA VERSION!
 
-This Hass.io Add-ons repository contains beta releases of add-ons.
+This Home Assistant Add-ons repository contains beta releases of add-ons.
 
 - They might stop working at any time.
 - They could have a negative impact on your system.
@@ -39,12 +39,12 @@ If you are more interested in stable releases of our add-ons:
 [buymeacoffee]: https://www.buymeacoffee.com/timmo
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
-[docs]: https://github.com/hassio-addons/addon-matrix/blob/v0.8.0/README.md
+[docs]: https://github.com/hassio-addons/addon-matrix/blob/v0.9.0/README.md
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
 [forum]: https://community.home-assistant.io
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-v0.8.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-matrix/tree/v0.8.0
+[release-shield]: https://img.shields.io/badge/version-v0.9.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-matrix/tree/v0.9.0
 [screenshot]: https://github.com/hassio-addons/addon-matrix/raw/master/images/screenshot.png
 [clients]: https://matrix.org/docs/projects/try-matrix-now.html
\ No newline at end of file
diff --git a/matrix/config.json b/matrix/config.json
index 29ca12d8..19a9e079 100644
--- a/matrix/config.json
+++ b/matrix/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Matrix",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "slug": "matrix",
   "description": "A secure and decentralized communication platform.",
   "url": "https://github.com/hassio-addons/addon-matrix",
@@ -27,7 +27,7 @@
   },
   "ports_description": {
     "8448/tcp": "Matrix Synapse Home Server",
-    "80/tcp": "Riot Matrix web client (Not required for Hass.io Ingress)"
+    "80/tcp": "Riot Matrix web client (Not required for Ingress)"
   },
   "map": [
     "config:rw",
@@ -41,7 +41,7 @@
     "server_name": "hassio.local"
   },
   "schema": {
-    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
+    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
     "ssl": "bool",
     "certfile": "str",
     "keyfile": "str",