diff --git a/README.md b/README.md
index 421c26fa..0c56de2a 100644
--- a/README.md
+++ b/README.md
@@ -1030,10 +1030,10 @@ SOFTWARE.
 [chrony-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [chrony-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [chrony-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-motioneye]: https://github.com/hassio-addons/addon-motioneye/tree/v0.3.0
-[addon-doc-motioneye]: https://github.com/hassio-addons/addon-motioneye/blob/v0.3.0/README.md
+[addon-motioneye]: https://github.com/hassio-addons/addon-motioneye/tree/v0.4.0
+[addon-doc-motioneye]: https://github.com/hassio-addons/addon-motioneye/blob/v0.4.0/README.md
 [motioneye-issue]: https://github.com/hassio-addons/addon-motioneye/issues
-[motioneye-version-shield]: https://img.shields.io/badge/version-v0.3.0-blue.svg
+[motioneye-version-shield]: https://img.shields.io/badge/version-v0.4.0-blue.svg
 [motioneye-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/motioneye.svg
 [motioneye-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [motioneye-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/motioneye/CHANGELOG.md b/motioneye/CHANGELOG.md
index 4d855656..eb9bd997 100644
--- a/motioneye/CHANGELOG.md
+++ b/motioneye/CHANGELOG.md
@@ -1,23 +1,50 @@
 [Full Changelog][changelog]
 
-### Changed
+✨ This release adds support for Hass.io Ingress 🎉 
 
-- Fixes spelling error in Dockerfile
-- Removes BountySource links
-- Updates maintenance year to 2019
-- Refactor of GitLab CI
-- Upgrades add-on base image to 2.3.1
-- Upgrades ffmpeg to 4.0.2-r0
-- Upgrades motion to 4.1.1-r0
-- Upgrades nginx to 1.14.2-r0
-- Configure Renovate (#16)
-- Replaces add-on link with GitHub link
-- Removes IPv6 switch
-- Refactor of installation method
-- Adds option to enable motion webcontrol (#17) (@ludeeus)
-- Adds mosquito clients
+Besides Ingress, this release adds major upgrades to motionEye & motion itself ⬆️ 
 
-[changelog]: https://github.com/hassio-addons/addon-motioneye/compare/v0.2.0...v0.3.0
+### ⚠️ Create snapshot before upgrade!
+
+If you upgrade from a previous version of the add-on, all your current configuration files need to be converted and migrated. The add-on will do this for you, nevertheless, it is **strongly** advised to create an Hass.io snapshot before upgrading.
+
+### 🚨Breaking change
+
+The addition of Ingress makes this add-on not accessible directly. If you have added motionEye via an iframe panel, this release will break that.
+
+However, you can enable this again by going into the add-on configuration. A new section show is visible: "Network". Enter port `8765` (or anything else if you want) in the `disabled` field. Hit the "SAVE" followed by the "RESTART" button to make your iframe work as before.
+
+An option to add an Ingress capable add-on to the sidebar menu automatically is expected to land in Home Assistant 0.92.
+
+### 🔨 Changes
+
+- :pencil2: Typo (#22) (@timmo001)
+- :arrow_up: Updates MarkupSafe to v1.1.1 (#23)
+- :arrow_up: Updates tornado to v6.0.2 (#28)
+- :arrow_up: Updates pillow to v6 (#29)
+- :arrow_up: Upgrades add-on base image to 3.1.0
+- :fire: Removes custom log format override
+- :hammer: Makes log_level optional
+- :arrow_up: Upgrades curl to 7.64.0-r1
+- :arrow_up: Upgrades gcc to 8.3.0-r0
+- :arrow_up: Upgrades musl-dev to 1.1.20-r4
+- :arrow_up: Upgrades pip to 18.1-r0
+- :arrow_up: Upgrades python to 2.7.15-r3
+- :arrow_up: Upgrades mosquitto-clients to 1.5.6-r0
+- :arrow_up: Upgrades py-setuptools to 40.6.3-r0
+- :arrow_up: Upgrades motion to 4.2.2-r0
+- :hammer: Rewrite add-on onto Bashio
+- :fire: Removes default config options
+- :sparkles: Adds Hassio Ingress support
+- :sparkles: Adds ARMv7 support
+- :ambulance: Workaround Docker issue by reinstating legacy tags
+- :arrow_up: Upgrades motioneye to 0.40rc5
+- :arrow_down: Downgrades tornado to 5.1.1
+- :hammer: Merged init scripts
+- :arrow_up: Updates jinja2 to v2.10.1 (#30)
+- :books: Updates documentation to match recent changes
+
+[changelog]: https://github.com/hassio-addons/addon-motioneye/compare/v0.3.0...v0.4.0
 
 Questions? Join our Discord server! https://discord.me/hassioaddons
 Enjoying my add-ons? Consider supporting my work: https://patreon.com/frenck
\ No newline at end of file
diff --git a/motioneye/README.md b/motioneye/README.md
index 7409fcf6..28809304 100644
--- a/motioneye/README.md
+++ b/motioneye/README.md
@@ -49,13 +49,13 @@ If you are more interested in stable releases of our add-ons:
 [buymeacoffee]: https://www.buymeacoffee.com/frenck
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
-[docs]: https://github.com/hassio-addons/addon-motioneye/blob/v0.3.0/README.md
+[docs]: https://github.com/hassio-addons/addon-motioneye/blob/v0.4.0/README.md
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
 [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-motioneye/71826?u=frenck
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg
 [patreon-shield]: https://www.frenck.nl/images/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-v0.3.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-motioneye/tree/v0.3.0
+[release-shield]: https://img.shields.io/badge/version-v0.4.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-motioneye/tree/v0.4.0
 [screenshot]: https://github.com/hassio-addons/addon-motioneye/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/motioneye/config.json b/motioneye/config.json
index c81475f6..11ba29cf 100644
--- a/motioneye/config.json
+++ b/motioneye/config.json
@@ -1,21 +1,30 @@
 {
   "name": "motionEye",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "slug": "motioneye",
   "description": "Simple, elegant and feature-rich CCTV/NVR for your cameras",
   "url": "https://github.com/hassio-addons/addon-motioneye",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8765]",
   "startup": "application",
+  "ingress": true,
+  "ingress_port": 0,
+  "homeassistant": "0.91.4",
   "arch": [
     "aarch64",
     "amd64",
     "armhf",
+    "armv7",
     "i386"
   ],
+  "ports": {
+    "80/tcp": null
+  },
+  "ports_description": {
+    "80/tcp": "Web interface (Not required for Hass.io Ingress)"
+  },
   "boot": "auto",
   "hassio_api": true,
   "hassio_role": "default",
-  "homeassistant_api": false,
   "host_network": true,
   "apparmor": false,
   "privileged": [
@@ -28,23 +37,17 @@
     "ssl"
   ],
   "options": {
-    "log_level": "info",
     "motion_webcontrol": false,
-    "port": 8765,
     "ssl": true,
     "certfile": "fullchain.pem",
     "keyfile": "privkey.pem"
   },
   "schema": {
-    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
     "motion_webcontrol": "bool",
-    "port": "port",
     "ssl": "bool",
     "certfile": "str",
     "keyfile": "str"
   },
-  "environment": {
-    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
-  },
   "image": "hassioaddons/motioneye"
 }
\ No newline at end of file