diff --git a/README.md b/README.md
index 1f4c75dc7..bd86a61a0 100644
--- a/README.md
+++ b/README.md
@@ -730,10 +730,10 @@ SOFTWARE.
 [glances-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [glances-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
 [glances-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/bf2582b
-[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/bf2582b/README.md
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/7eb4eb3
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/7eb4eb3/README.md
 [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
-[grafana-version-shield]: https://img.shields.io/badge/version-bf2582b-blue.svg
+[grafana-version-shield]: https://img.shields.io/badge/version-7eb4eb3-blue.svg
 [grafana-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/grafana.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 ecbce48ac..19f8b1e0f 100644
--- a/grafana/CHANGELOG.md
+++ b/grafana/CHANGELOG.md
@@ -1,35 +1,5 @@
-# Changelog since v1.3.0
+# Changelog since v2.0.0
 
-2019/03/17 14:32 UTC - [bf2582b](https://github.com/hassio-addons/addon-grafana/commit/bf2582b4f231691dbef9f6b08d972bf546d00961) by [@frenck](https://github.com/frenck)
-> :books: Updates documentation for ARMv7 
-
-2019/03/17 14:32 UTC - [a47a7ec](https://github.com/hassio-addons/addon-grafana/commit/a47a7eca96a7946fec4aaf310e2f4dddc10a0922) by [@frenck](https://github.com/frenck)
-> :ambulance: Fixes Grafana log level logic 
-
-2019/03/17 14:32 UTC - [013e1d8](https://github.com/hassio-addons/addon-grafana/commit/013e1d8c0007222dad685202f977e971fc26dade) by [@frenck](https://github.com/frenck)
-> :ambulance: Fetch proper Grafana package for ARMv7 
-
-2019/03/17 14:32 UTC - [fba4651](https://github.com/hassio-addons/addon-grafana/commit/fba4651e13b5e4d3e79e9b9acb56326afca6e7c5) by [@frenck](https://github.com/frenck)
-> :hammer: Makes Grafana wait for Memcached before starting 
-
-2019/03/17 14:32 UTC - [f5118fc](https://github.com/hassio-addons/addon-grafana/commit/f5118fcf6f6ed066d41041f4f56d85bb5cf9b616) by [@frenck](https://github.com/frenck)
-> :hammer: Rewrite add-on onto Bashio 
-
-2019/03/17 14:32 UTC - [b2febbc](https://github.com/hassio-addons/addon-grafana/commit/b2febbcf920dd5a1a19a2bab9c11adc8e059464a) by [@frenck](https://github.com/frenck)
-> :hammer: Makes log_level optional 
-
-2019/03/17 14:32 UTC - [283834e](https://github.com/hassio-addons/addon-grafana/commit/283834e3c5475053a354dfa79efd00c91060f69e) by [@frenck](https://github.com/frenck)
-> :fire: Removes custom log format override 
-
-2019/03/17 14:32 UTC - [b020726](https://github.com/hassio-addons/addon-grafana/commit/b02072686ca0007572e61afbdac173dcc3c886fc) by [@frenck](https://github.com/frenck)
-> :hammer: Replaces ARMHF support with ARMv7 
-
-2019/03/17 14:32 UTC - [c8d7176](https://github.com/hassio-addons/addon-grafana/commit/c8d7176b113a507d1dec74063279847a951f0a8e) by [@frenck](https://github.com/frenck)
-> :fire: Drops legacy tag support 
-
-2019/03/17 14:32 UTC - [8cd37a7](https://github.com/hassio-addons/addon-grafana/commit/8cd37a715a0678923e93c1f7e51486074ac6b4cf) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades add-on base image to 3.0.0 
-
-2019/03/17 14:32 UTC - [d5d01a0](https://github.com/hassio-addons/addon-grafana/commit/d5d01a087b678d36a5c1b59d71ad2e24f177c8f8) by [@timmo001](https://github.com/timmo001)
-> :arrow_up: Update Grafana to v6.0.1 (#27) 
+2019/03/19 14:44 UTC - [7eb4eb3](https://github.com/hassio-addons/addon-grafana/commit/7eb4eb3002d33bb692b77dc23cc0639b0e9aae5c) by [@frenck](https://github.com/frenck)
+> :arrow_up: Upgrades Grafana to v6.0.2 
 
diff --git a/grafana/README.md b/grafana/README.md
index 61e4b449e..14e63f636 100644
--- a/grafana/README.md
+++ b/grafana/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-grafana/blob/bf2582b/README.md
+[docs]: https://github.com/hassio-addons/addon-grafana/blob/7eb4eb3/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-bf2582b-blue.svg
-[release]: https://github.com/hassio-addons/addon-grafana/tree/bf2582b
+[release-shield]: https://img.shields.io/badge/version-7eb4eb3-blue.svg
+[release]: https://github.com/hassio-addons/addon-grafana/tree/7eb4eb3
 [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 225f6448b..31bbab5cd 100644
--- a/grafana/config.json
+++ b/grafana/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Grafana",
-  "version": "bf2582b",
+  "version": "7eb4eb3",
   "slug": "grafana",
   "description": "The open platform for beautiful analytics and monitoring",
   "url": "https://github.com/hassio-addons/addon-grafana",