diff --git a/README.md b/README.md
index c812b9b8..fdc0cc98 100644
--- a/README.md
+++ b/README.md
@@ -766,10 +766,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/v6.3.5
-[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v6.3.5/README.md
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/v7.0.0
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v7.0.0/README.md
 [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
-[grafana-version-shield]: https://img.shields.io/badge/version-v6.3.5-blue.svg
+[grafana-version-shield]: https://img.shields.io/badge/version-v7.0.0-blue.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
 [grafana-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
diff --git a/grafana/CHANGELOG.md b/grafana/CHANGELOG.md
index 627074c8..da5ce350 100644
--- a/grafana/CHANGELOG.md
+++ b/grafana/CHANGELOG.md
@@ -1,14 +1,17 @@
 ## What’s changed
 
-## 🐛 Bug fixes
+This release brings Grafana 8! 🎉 
 
-- 🔨 Fix grafana-image-renderer dependencies @sinclairpaul (#159)
+## 🚀 Enhancements
+
+- Remove NGINX access log from Supervisor log output @frenck (#171)
 
 ## ⬆️ Dependency updates
 
-- ⬆️ Bump actions/stale from 3.0.18 to 3.0.19 @dependabot (#156)
-- ⬆️ Upgrades Grafana to v7.5.7 @frenck (#158)
-- ⬆️ Bump frenck/action-addon-information from 1.0.0 to 1.1 @dependabot (#157)
-- 🔨 Fix grafana-image-renderer dependencies @sinclairpaul (#159)
-- ⬆️ Bump micnncim/action-label-syncer from 1.2.0 to 1.3.0 @dependabot (#160)
-- ⬆️ Upgrades Grafana Image Renderer to 2.1.1 @frenck (#161)
+- ⬆️ Bump docker/build-push-action from 2.4.0 to 2.5.0 @dependabot (#162)
+- ⬆️ Bump docker/setup-qemu-action from 1.1.0 to 1.2.0 @dependabot (#163)
+- ⬆️ Bump actions/cache from 2.1.5 to 2.1.6 @dependabot (#164)
+- ⬆️ Bump frenck/action-addon-information from 1.1 to 1.2.2 @dependabot (#167)
+- ⬆️ Upgrades add-on base image to v4.2.1 @frenck (#168)
+- ⬆️ Upgrades Grafana to v8.0.1 @frenck (#169)
+- ⬆️ Upgrades Grafana Image Renderer to 3.0.1 @frenck (#170)
diff --git a/grafana/README.md b/grafana/README.md
index b8bb8943..8b2bce61 100644
--- a/grafana/README.md
+++ b/grafana/README.md
@@ -34,6 +34,6 @@ insights to your home.
 [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-v6.3.5-blue.svg
-[release]: https://github.com/hassio-addons/addon-grafana/tree/v6.3.5
+[release-shield]: https://img.shields.io/badge/version-v7.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-grafana/tree/v7.0.0
 [screenshot]: https://github.com/hassio-addons/addon-grafana/raw/main/images/screenshot.png
\ No newline at end of file
diff --git a/grafana/config.json b/grafana/config.json
index 67fa5853..8098ad59 100644
--- a/grafana/config.json
+++ b/grafana/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Grafana",
-  "version": "6.3.5",
+  "version": "7.0.0",
   "slug": "grafana",
   "description": "The open platform for beautiful analytics and monitoring",
   "url": "https://github.com/hassio-addons/addon-grafana",