diff --git a/README.md b/README.md
index 00a0590e1..eb9056956 100644
--- a/README.md
+++ b/README.md
@@ -598,10 +598,10 @@ SOFTWARE.
 [ftp-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [ftp-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [ftp-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/82d7706
-[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/82d7706/README.md
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/b84909e
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/b84909e/README.md
 [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
-[grafana-version-shield]: https://img.shields.io/badge/version-82d7706-blue.svg
+[grafana-version-shield]: https://img.shields.io/badge/version-b84909e-blue.svg
 [grafana-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/grafana-armhf.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 f064bc9a4..d7adb5eff 100644
--- a/grafana/CHANGELOG.md
+++ b/grafana/CHANGELOG.md
@@ -1,15 +1,25 @@
 # Changelog since v1.1.0
 
-2018/12/03 11:23 UTC - [82d7706](https://github.com/hassio-addons/addon-grafana/commit/82d77066ef3150d0dac014b4ca3ef3304131862a) by [@frenck](https://github.com/frenck)
+2018/12/03 20:49 UTC - [b84909e](https://github.com/hassio-addons/addon-grafana/commit/b84909e7eea65c7a21bf96f77f269d05f40b8e97) by [@HoppingMonk](https://github.com/HoppingMonk)
+> :lock: Limits supported machines (#14)
+
+Most ARM-based devices are supported, but a ARMv6 is not. 
+
+2018/12/03 20:49 UTC - [c966d1d](https://github.com/hassio-addons/addon-grafana/commit/c966d1d7760dac65b1595356e257b3dc09ad48e3) by [@goern](https://github.com/goern)
+> :books: Corrects the env var name (#16)
+
+Signed-off-by: Christoph Görn <goern@b4mad.net> 
+
+2018/12/03 20:49 UTC - [82d7706](https://github.com/hassio-addons/addon-grafana/commit/82d77066ef3150d0dac014b4ca3ef3304131862a) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades Grafana to 5.4.0 
 
-2018/12/03 11:23 UTC - [0f08854](https://github.com/hassio-addons/addon-grafana/commit/0f0885457ef2c36b1952e3dea4ebe717407c8c8c) by [@frenck](https://github.com/frenck)
+2018/12/03 20:49 UTC - [0f08854](https://github.com/hassio-addons/addon-grafana/commit/0f0885457ef2c36b1952e3dea4ebe717407c8c8c) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades Grafana to 5.3.4 
 
-2018/12/03 11:23 UTC - [8b0cc7d](https://github.com/hassio-addons/addon-grafana/commit/8b0cc7dac95c48d6502cd03a35919c5a7afe63d4) by [@frenck](https://github.com/frenck)
+2018/12/03 20:49 UTC - [8b0cc7d](https://github.com/hassio-addons/addon-grafana/commit/8b0cc7dac95c48d6502cd03a35919c5a7afe63d4) by [@frenck](https://github.com/frenck)
 > :fire: Removes phantomjs 
 
-2018/12/03 11:23 UTC - [64d9994](https://github.com/hassio-addons/addon-grafana/commit/64d9994e537f2bb89b6310432d1e2d2a6fd07fde) by [@dayofdoom](https://github.com/dayofdoom)
+2018/12/03 20:49 UTC - [64d9994](https://github.com/hassio-addons/addon-grafana/commit/64d9994e537f2bb89b6310432d1e2d2a6fd07fde) by [@dayofdoom](https://github.com/dayofdoom)
 > :books: Changed past to paste (#13)
 
 Changed past to paste. Simple spelling fix. 
diff --git a/grafana/README.md b/grafana/README.md
index 7a878d4f1..5c7d962bb 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/82d7706/README.md
+[docs]: https://github.com/hassio-addons/addon-grafana/blob/b84909e/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/2018.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-82d7706-blue.svg
-[release]: https://github.com/hassio-addons/addon-grafana/tree/82d7706
+[release-shield]: https://img.shields.io/badge/version-b84909e-blue.svg
+[release]: https://github.com/hassio-addons/addon-grafana/tree/b84909e
 [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 72632d14d..cccb3d793 100644
--- a/grafana/config.json
+++ b/grafana/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Grafana",
-  "version": "82d7706",
+  "version": "b84909e",
   "slug": "grafana",
   "description": "The open platform for beautiful analytics and monitoring",
   "url": "https://community.home-assistant.io/t/community-hass-io-add-on-grafana/54674?u=frenck",
@@ -11,6 +11,19 @@
     "amd64",
     "armhf"
   ],
+  "machine": [
+    "intel-nuc",
+    "qemux86",
+    "qemux86-64",
+    "qemuarm",
+    "qemuarm-64",
+    "raspberrypi2",
+    "raspberrypi3",
+    "raspberrypi3-64",
+    "tinker",
+    "odroid-c2",
+    "odroid-xu"
+  ],
   "map": [
     "ssl"
   ],