diff --git a/README.md b/README.md
index 628fe129..228550d7 100644
--- a/README.md
+++ b/README.md
@@ -820,10 +820,10 @@ SOFTWARE.
 [glances-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [glances-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [glances-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/v2.3.0
-[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v2.3.0/README.md
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/v3.0.0
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v3.0.0/README.md
 [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
-[grafana-version-shield]: https://img.shields.io/badge/version-v2.3.0-blue.svg
+[grafana-version-shield]: https://img.shields.io/badge/version-v3.0.0-blue.svg
 [grafana-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/grafana-amd64.svg
 [grafana-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [grafana-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/grafana/CHANGELOG.md b/grafana/CHANGELOG.md
index ac35f115..285fca51 100644
--- a/grafana/CHANGELOG.md
+++ b/grafana/CHANGELOG.md
@@ -1,15 +1,26 @@
 [Full Changelog][changelog]
 
-This is a general maintenance release.
+### ⚠️ This is a major release! Be sure to take a snapshot before upgrading! ⚠️ 
+
+Introducing full-blown Hass.io Ingress support for Grafana 🎉 
+
+This means that add-on now works when using [Nabu Casa's Remote UI](https://www.nabucasa.com/config/remote/) to access your Home Assistant instance. 😎
+
+Ingress also takes care of authentication (so no need to login anymore) and allows you to add Grafana into your Home Assistant sidebar with a single click. 🤘
+
+### :warning: Please note:
+- Create a snapshot/backup before upgrading!
+- If you have configured a `panel_iframe` for Grafana in your Home Assistant configuration, please remove it and use the "Show in sidebar" toggle in the add-on options.
+- Direct access to the add-on has been removed in favor of Ingress support.
 
 ### 🔨  Changes
 
-- :arrow_up: Upgrades add-on base image to v4.0.0
-- :fire: Removes secrets handling, now handled by Hassio
-- :arrow_up: Upgrades memcached to 1.5.6-0ubuntu1.2
-- :arrow_up: Upgrades Grafana to 3.6.3
+- :arrow_up: Upgrades Grafana to v6.4.2
+- :books: Component > Integration (#50)
+- :sparkles: Adds Ingress support
+- :shirt: Fixes Markdownlint warnings
 
-[changelog]: https://github.com/hassio-addons/addon-grafana/compare/v2.2.5...v2.3.0
+[changelog]: https://github.com/hassio-addons/addon-grafana/compare/v2.3.0...v3.0.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/grafana/README.md b/grafana/README.md
index 96e70d28..567dc42a 100644
--- a/grafana/README.md
+++ b/grafana/README.md
@@ -46,13 +46,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-grafana/blob/v2.3.0/README.md
+[docs]: https://github.com/hassio-addons/addon-grafana/blob/v3.0.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-grafana/54674?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-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v2.3.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-grafana/tree/v2.3.0
+[release-shield]: https://img.shields.io/badge/version-v3.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-grafana/tree/v3.0.0
 [screenshot]: https://github.com/hassio-addons/addon-grafana/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/grafana/config.json b/grafana/config.json
index 242557ad..71c61655 100644
--- a/grafana/config.json
+++ b/grafana/config.json
@@ -1,40 +1,28 @@
 {
   "name": "Grafana",
-  "version": "2.3.0",
+  "version": "3.0.0",
   "slug": "grafana",
   "description": "The open platform for beautiful analytics and monitoring",
   "url": "https://github.com/hassio-addons/addon-grafana",
-  "webui": "[PROTO:ssl]://[HOST]:[PORT:80]",
   "startup": "services",
+  "ingress": true,
+  "ingress_port": 80,
+  "panel_icon": "mdi:chart-timeline",
+  "panel_title": "Grafana",
   "arch": [
     "aarch64",
     "amd64",
     "armv7"
   ],
-  "ports": {
-    "80/tcp": 3000
-  },
-  "ports_description": {
-    "80/tcp": "Grafana web interface"
-  },
-  "map": [
-    "ssl"
-  ],
   "boot": "auto",
   "hassio_api": true,
   "hassio_role": "default",
   "options": {
-    "ssl": true,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem",
     "plugins": [],
     "env_vars": []
   },
   "schema": {
     "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
-    "ssl": "bool",
-    "certfile": "str",
-    "keyfile": "str",
     "plugins": [
       "str"
     ],