diff --git a/README.md b/README.md
index 754c3ec8..16741106 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/v3.0.2
-[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v3.0.2/README.md
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/v4.0.0
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v4.0.0/README.md
 [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
-[grafana-version-shield]: https://img.shields.io/badge/version-v3.0.2-blue.svg
+[grafana-version-shield]: https://img.shields.io/badge/version-v4.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 0d26c8ac..40f5cca4 100644
--- a/grafana/CHANGELOG.md
+++ b/grafana/CHANGELOG.md
@@ -1,12 +1,24 @@
 [Full Changelog][changelog]
 
-This is a general maintenance release.
+Thanks to the great work of @sinclairpaul, this release re-instates direct access to the add-on, while maintaining and improving Hass.io Ingress as well! 🎉 If you want to enable direct access, you can assign a port for it in the add-on network options.
+
+Ingress got a nice improvement as well! It can now actually be a logged-in user, instead of an anonymous user with limited access.
+
+By default, Ingress uses the user `admin`, if you have a different username you use already, and like to use it with Ingress, set it using the `grafana_ingress_user` option. See the add-on documentation for more information on this.
 
 ### 🔨  Changes
 
-- :arrow_up: Upgrades Grafana to v6.5.1
+- :arrow_up: Upgrades Grafana to 6.5.2
+- :fireworks: Updates maintenance/license year to 2020
+- :pencil2: Fixes some spelling and grammar
+- :pencil2: Funding adjustments
+- :arrow_up: Upgrades add-on base image to v4.0.3
+- :pencil2: Fixes some spelling and grammar
+- 🚑Allow direct access to addon (#62)
+- :books: Adds ingress user option to config example
 
-[changelog]: https://github.com/hassio-addons/addon-grafana/compare/v3.0.1...v3.0.2
+[changelog]: https://github.com/hassio-addons/addon-grafana/compare/v3.0.2...v4.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
+Enjoying my add-ons? Consider supporting my work:
+https://github.com/sponsors/frenck or https://patreon.com/frenck
\ No newline at end of file
diff --git a/grafana/README.md b/grafana/README.md
index 12b34eb9..fe462257 100644
--- a/grafana/README.md
+++ b/grafana/README.md
@@ -4,9 +4,9 @@
 
 [![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
 
-[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
+[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors]
 
-[![Support my work on Patreon][patreon-shield]][patreon]
+[![Support Frenck on Patreon][patreon-shield]][patreon]
 
 The open platform for beautiful analytics and monitoring.
 
@@ -42,17 +42,17 @@ If you are more interested in stable releases of our add-ons:
 
 <https://github.com/hassio-addons/repository>
 
-[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
-[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/v3.0.2/README.md
+[docs]: https://github.com/hassio-addons/addon-grafana/blob/v4.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
+[github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
+[github-sponsors]: https://github.com/sponsors/frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg
+[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/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-v3.0.2-blue.svg
-[release]: https://github.com/hassio-addons/addon-grafana/tree/v3.0.2
+[release-shield]: https://img.shields.io/badge/version-v4.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-grafana/tree/v4.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 80e9a28e..7cbe7276 100644
--- a/grafana/config.json
+++ b/grafana/config.json
@@ -1,12 +1,12 @@
 {
   "name": "Grafana",
-  "version": "3.0.2",
+  "version": "4.0.0",
   "slug": "grafana",
   "description": "The open platform for beautiful analytics and monitoring",
   "url": "https://github.com/hassio-addons/addon-grafana",
   "startup": "services",
   "ingress": true,
-  "ingress_port": 80,
+  "ingress_port": 1337,
   "panel_icon": "mdi:chart-timeline",
   "panel_title": "Grafana",
   "arch": [
@@ -17,15 +17,31 @@
   "boot": "auto",
   "hassio_api": true,
   "hassio_role": "default",
+  "map": [
+    "ssl"
+  ],
   "options": {
     "plugins": [],
-    "env_vars": []
+    "env_vars": [],
+    "ssl": true,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem"
+  },
+  "ports": {
+    "80/tcp": null
+  },
+  "ports_description": {
+    "80/tcp": "Not required for Ingress"
   },
   "schema": {
     "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
     "plugins": [
       "str"
     ],
+    "certfile": "str",
+    "keyfile": "str",
+    "ssl": "bool",
+    "grafana_ingress_user": "str?",
     "env_vars": [
       {
         "name": "match(^GF_([A-Z0-9_])+$)",