diff --git a/README.md b/README.md
index 9e2e5f70..4bf55879 100644
--- a/README.md
+++ b/README.md
@@ -865,10 +865,10 @@ SOFTWARE.
 [mqtt-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [mqtt-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
 [mqtt-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-matrix]: https://github.com/hassio-addons/addon-matrix/tree/v0.3.1
-[addon-doc-matrix]: https://github.com/hassio-addons/addon-matrix/blob/v0.3.1/README.md
+[addon-matrix]: https://github.com/hassio-addons/addon-matrix/tree/v0.4.0
+[addon-doc-matrix]: https://github.com/hassio-addons/addon-matrix/blob/v0.4.0/README.md
 [matrix-issue]: https://github.com/hassio-addons/addon-matrix/issues
-[matrix-version-shield]: https://img.shields.io/badge/version-v0.3.1-blue.svg
+[matrix-version-shield]: https://img.shields.io/badge/version-v0.4.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 2fe6d4d7..c2d88281 100644
--- a/matrix/CHANGELOG.md
+++ b/matrix/CHANGELOG.md
@@ -1,9 +1,27 @@
+[![GitLab CI][gitlabci-shield]][gitlabci]
+
+This version adds ingress support. :tada: Please note that the ports setup has changed in this release to default to using ingress only for the frontend (Riot). To go back to the traditional setup, map a preferred port in the network section.
+
+Also, note that the Synapse (the Matrix server) will still be on port 8448 (by default) so you will still have to forward that port (or use a VPN solution) if you want to use Matrix outside of your home network.
+
 ## Changes
 
-- 33da71c :arrow_up: Update Riot to v1.0.5 
-- c11b039 :arrow_up: Update Synapse to v0.99.3 
-- e304241 :arrow_up: Update Riot to v1.0.6 
+- f5e8919 :hammer: Major refactor of add-on (#11) 
+  - Moves add-on onto Python base images
+  - Moves requirements into a separate TXT file, so renovatebot can help out
+  - Adds support for Ingress
+  - Adds port descriptions
+  - Adds HA authentication when accessing riot directly
+  - Replaces Nginx configuration
+  - Improved python cleanup logic in Dockerfile
+  - Updated documentation
+  - Makes NGinx wait for Synapse to start
+  - Forces ports & interfaces to use
+- 2ac6f21 :arrow_up: Updates pysaml2 to v4.7.0 (#12) 
+- 38351f8 :ambulance: Ensure keys are generated on the first run
 
 [Full Changelog][changelog]
 
-[changelog]: https://github.com/hassio-addons/addon-matrix/compare/v0.3.0...v0.3.1
\ No newline at end of file
+[changelog]: https://github.com/hassio-addons/addon-matrix/compare/v0.3.1...v0.4.0
+[gitlabci-shield]: https://gitlab.com/hassio-addons/addon-matrix/badges/v0.4.0/pipeline.svg
+[gitlabci]: https://gitlab.com/hassio-addons/addon-matrix/pipelines
diff --git a/matrix/README.md b/matrix/README.md
index 2163d254..d94d0a64 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.3.1/README.md
+[docs]: https://github.com/hassio-addons/addon-matrix/blob/v0.4.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.3.1-blue.svg
-[release]: https://github.com/hassio-addons/addon-matrix/tree/v0.3.1
+[release-shield]: https://img.shields.io/badge/version-v0.4.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-matrix/tree/v0.4.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 86e123b9..a05590f1 100644
--- a/matrix/config.json
+++ b/matrix/config.json
@@ -1,11 +1,13 @@
 {
   "name": "Matrix",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "slug": "matrix",
   "description": "A secure and decentralized communication platform.",
   "url": "https://community.home-assistant.io",
-  "webui": "http://[HOST]:[PORT:8558]",
+  "webui": "http://[HOST]:[PORT:80]",
   "startup": "application",
+  "ingress": true,
+  "ingress_port": 1337,
   "arch": [
     "aarch64",
     "amd64",
@@ -16,10 +18,14 @@
   "boot": "auto",
   "hassio_api": true,
   "hassio_role": "default",
-  "host_network": false,
+  "auth_api": true,
   "ports": {
     "8448/tcp": 8448,
-    "8558/tcp": 8558
+    "80/tcp": null
+  },
+  "ports_description": {
+    "8448/tcp": "Matrix Synapse Home Server",
+    "80/tcp": "Riot Matrix web client (Not required for Hass.io Ingress)"
   },
   "map": [
     "config:rw",
@@ -27,21 +33,18 @@
     "ssl"
   ],
   "options": {
-    "log_level": "info",
     "ssl": true,
     "certfile": "fullchain.pem",
     "keyfile": "privkey.pem",
     "server_name": "hassio.local"
   },
   "schema": {
-    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
     "ssl": "bool",
     "certfile": "str",
     "keyfile": "str",
-    "server_name": "str"
-  },
-  "environment": {
-    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+    "server_name": "str",
+    "leave_front_door_open": "bool?"
   },
   "image": "hassioaddons/matrix-{arch}"
 }
\ No newline at end of file