diff --git a/README.md b/README.md
index 8d0f9f5d7..b2e9a75b1 100644
--- a/README.md
+++ b/README.md
@@ -791,10 +791,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/3f41b33
-[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/3f41b33/README.md
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/6f6359f
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/6f6359f/README.md
 [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
-[grafana-version-shield]: https://img.shields.io/badge/version-3f41b33-blue.svg
+[grafana-version-shield]: https://img.shields.io/badge/version-6f6359f-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 c36a454ff..8187212e6 100644
--- a/grafana/CHANGELOG.md
+++ b/grafana/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Changelog since v7.2.0
+- ⬆️ Upgrades add-on base image to 5.1.1 (#216) 
+- ⬆️ Upgrades Grafana to v8.1.7 (#217) 
 - ⬆ Upgrade lock-threads workflow to 3.0.0 (#215) 
 - ⬆️ Bump frenck/action-addon-linter from 2.3 to 2.4.1 (#214)
 
diff --git a/grafana/README.md b/grafana/README.md
index 393fae8b7..421cfd846 100644
--- a/grafana/README.md
+++ b/grafana/README.md
@@ -53,6 +53,6 @@ If you are more interested in stable releases of our add-ons:
 [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-3f41b33-blue.svg
-[release]: https://github.com/hassio-addons/addon-grafana/tree/3f41b33
+[release-shield]: https://img.shields.io/badge/version-6f6359f-blue.svg
+[release]: https://github.com/hassio-addons/addon-grafana/tree/6f6359f
 [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 10ff60c5f..0dad82cad 100644
--- a/grafana/config.json
+++ b/grafana/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Grafana",
-  "version": "3f41b33",
+  "version": "6f6359f",
   "slug": "grafana",
   "description": "The open platform for beautiful analytics and monitoring",
   "url": "https://github.com/hassio-addons/addon-grafana",