diff --git a/README.md b/README.md
index a815349a..c9e8de04 100644
--- a/README.md
+++ b/README.md
@@ -690,10 +690,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/v1.3.0
-[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v1.3.0/README.md
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/v2.0.0
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v2.0.0/README.md
 [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
-[grafana-version-shield]: https://img.shields.io/badge/version-v1.3.0-blue.svg
+[grafana-version-shield]: https://img.shields.io/badge/version-v2.0.0-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 64446230..de499b25 100644
--- a/grafana/CHANGELOG.md
+++ b/grafana/CHANGELOG.md
@@ -2,10 +2,19 @@
 
 ### Changed
 
-- Upgrades Grafana to 6.0.0
-- Upgrades add-on base image to 2.3.1
+- Update Grafana to v6.0.1 (#27) (@timmo001)
+- Upgrades add-on base image to 3.0.0
+- Drops legacy tag support
+- Replaces ARMHF support with ARMv7
+- Removes custom log format override
+- Makes log_level optional
+- Rewrite add-on onto Bashio
+- Makes Grafana wait for Memcached before starting
+- Fetch proper Grafana package for ARMv7
+- Fixes Grafana log level logic
+- Updates documentation for ARMv7
 
-[changelog]: https://github.com/hassio-addons/addon-grafana/compare/v1.2.2...v1.3.0
+[changelog]: https://github.com/hassio-addons/addon-grafana/compare/v1.3.0...v2.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 ead6c827..8e9e8411 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/v1.3.0/README.md
+[docs]: https://github.com/hassio-addons/addon-grafana/blob/v2.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-v1.3.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-grafana/tree/v1.3.0
+[release-shield]: https://img.shields.io/badge/version-v2.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-grafana/tree/v2.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 54c2804b..93e34ab1 100644
--- a/grafana/config.json
+++ b/grafana/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Grafana",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "slug": "grafana",
   "description": "The open platform for beautiful analytics and monitoring",
   "url": "https://github.com/hassio-addons/addon-grafana",
@@ -9,20 +9,7 @@
   "arch": [
     "aarch64",
     "amd64",
-    "armhf"
-  ],
-  "machine": [
-    "intel-nuc",
-    "qemux86",
-    "qemux86-64",
-    "qemuarm",
-    "qemuarm-64",
-    "raspberrypi2",
-    "raspberrypi3",
-    "raspberrypi3-64",
-    "tinker",
-    "odroid-c2",
-    "odroid-xu"
+    "armv7"
   ],
   "map": [
     "ssl"
@@ -36,7 +23,6 @@
   "homeassistant_api": false,
   "host_network": false,
   "options": {
-    "log_level": "info",
     "ssl": true,
     "certfile": "fullchain.pem",
     "keyfile": "privkey.pem",
@@ -44,7 +30,7 @@
     "env_vars": []
   },
   "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",
@@ -58,8 +44,5 @@
       }
     ]
   },
-  "environment": {
-    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
-  },
-  "image": "hassioaddons/grafana-{arch}"
+  "image": "hassioaddons/grafana"
 }
\ No newline at end of file