diff --git a/README.md b/README.md
index dc1cc7c1..0129a001 100644
--- a/README.md
+++ b/README.md
@@ -905,10 +905,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.5.2
-[addon-doc-matrix]: https://github.com/hassio-addons/addon-matrix/blob/v0.5.2/README.md
+[addon-matrix]: https://github.com/hassio-addons/addon-matrix/tree/v0.6.0
+[addon-doc-matrix]: https://github.com/hassio-addons/addon-matrix/blob/v0.6.0/README.md
 [matrix-issue]: https://github.com/hassio-addons/addon-matrix/issues
-[matrix-version-shield]: https://img.shields.io/badge/version-v0.5.2-blue.svg
+[matrix-version-shield]: https://img.shields.io/badge/version-v0.6.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 ca552b17..af5b2238 100644
--- a/matrix/CHANGELOG.md
+++ b/matrix/CHANGELOG.md
@@ -2,18 +2,17 @@
 
 ## Changes
 
-- 6e2f7b9 :arrow_up: Update postgresql-dev to 11.3-r0 
-- 88a1dac :arrow_up: Update libpq to 11.3-r0 
-- 9e56b5b :arrow_up: Update nginx to 1.14.2-r1 
-- c8fde1b :arrow_up: Update nginx-mod-http-lua 1.14.2-r1 
-- 2ec9dcc :arrow_up: Updates matrix-synapse to v0.99.4 (#14) 
-- 71a9c26 :arrow_up: Update riot to v1.1.2 
-- 82cac0f :arrow_up: Updates matrix-synapse to v0.99.5.2 (#15) 
-- b3b680f :arrow_up: Update base to v1.1.1 
-- 65a25f8 :arrow_up: Update Matrix to v1.2.1 
+- 8a055c9 :arrow_up: Updates matrix-synapse to v1 (#16) 
+- ff142a1 :pencil2: Maintaince -> Maintenance 
+- 8dc7a11 :arrow_up: Updates matrix-synapse to v1.1.0 (#18) 
+- 7ced68b :arrow_up: Updates pysaml2 to v4.8.0 (#19) 
+- b81cb2f :arrow_up: Upgrade to base v2.0.1 
+- 38706ca :arrow_up: Upgrade packages 
+- cf1a1bb :arrow_up: Upgrade riot to v1.2.4 
+- 60804f6 :books: Update stage badge 
 
 [Full Changelog][changelog]
 
-[changelog]: https://github.com/hassio-addons/addon-matrix/compare/v0.5.1...v0.5.2
-[gitlabci-shield]: https://gitlab.com/hassio-addons/addon-matrix/badges/v0.5.2/pipeline.svg
+[changelog]: https://github.com/hassio-addons/addon-matrix/compare/v0.5.2...v0.6.0
+[gitlabci-shield]: https://gitlab.com/hassio-addons/addon-matrix/badges/v0.6.0/pipeline.svg
 [gitlabci]: https://gitlab.com/hassio-addons/addon-matrix/pipelines
diff --git a/matrix/README.md b/matrix/README.md
index 753d4f77..a235231f 100644
--- a/matrix/README.md
+++ b/matrix/README.md
@@ -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.5.2/README.md
+[docs]: https://github.com/hassio-addons/addon-matrix/blob/v0.6.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/2019.svg
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-v0.5.2-blue.svg
-[release]: https://github.com/hassio-addons/addon-matrix/tree/v0.5.2
+[release-shield]: https://img.shields.io/badge/version-v0.6.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-matrix/tree/v0.6.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 846985c9..92e668b5 100644
--- a/matrix/config.json
+++ b/matrix/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Matrix",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "slug": "matrix",
   "description": "A secure and decentralized communication platform.",
   "url": "https://community.home-assistant.io",