diff --git a/README.md b/README.md
index 47a0d7e6..6d99ec08 100644
--- a/README.md
+++ b/README.md
@@ -777,10 +777,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/v7.2.0
-[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v7.2.0/README.md
+[addon-grafana]: https://github.com/hassio-addons/addon-grafana/tree/v7.3.0
+[addon-doc-grafana]: https://github.com/hassio-addons/addon-grafana/blob/v7.3.0/README.md
 [grafana-issue]: https://github.com/hassio-addons/addon-grafana/issues
-[grafana-version-shield]: https://img.shields.io/badge/version-v7.2.0-blue.svg
+[grafana-version-shield]: https://img.shields.io/badge/version-v7.3.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 b6aca173..fb76f7dd 100644
--- a/grafana/CHANGELOG.md
+++ b/grafana/CHANGELOG.md
@@ -1,7 +1,32 @@
 ## What’s changed
 
+## 🐛 Bug fixes
+
+- docker install CJK font support grafana-image-renderer @bestlong (#202)
+
+## 🚀 Enhancements
+
+- Migrate JSON config to YAML @frenck (#225)
+
+## 🧰 Maintenance
+
+- Switch to centralized GitHub Action Workflows @frenck (#224)
+
 ## ⬆️ Dependency updates
 
-- ⬆️ Bump dessant/lock-threads from 2.1.1 to 2.1.2 @dependabot (#196)
-- ⬆️ Upgrades add-on base image to v5.0.0 @frenck (#197)
-- ⬆️ Upgrades Grafana to v8.1.2 @frenck (#198)
+- ⬆️ Bump docker/build-push-action from 2.6.1 to 2.7.0 @dependabot (#199)
+- ⬆️ Bump frenck/action-addon-linter from 2.2 to 2.3 @dependabot (#200)
+- ⬆️ Bump creyD/prettier_action from 3.3 to 4.0 @dependabot (#205)
+- ⬆️ Bump docker/setup-buildx-action from 1.5.1 to 1.6.0 @dependabot (#204)
+- ⬆️ Upgrades add-on base image to 5.1.0 @frenck (#208)
+- ⬆️ Upgrades Grafana to v8.1.5 @frenck (#209)
+- ⬆️ Upgrades Grafana Image Renderer to 3.2.0 @frenck (#210)
+- ⬆️ Bump frenck/action-addon-linter from 2.3 to 2.4.1 @dependabot (#214)
+- ⬆️ Upgrade lock-threads workflow to 3.0.0 @frenck (#215)
+- ⬆️ Upgrades Grafana to v8.1.7 @frenck (#217)
+- ⬆️ Upgrades add-on base image to 5.1.1 @frenck (#216)
+- ⬆️ Bump actions/checkout from 2.3.4 to 2.3.5 @dependabot (#218)
+- ⬆️ Upgrades add-on base image to 5.2.0 @frenck (#226)
+- ⬆️ Upgrades add-on base image to 5.2.2 @frenck (#227)
+- ⬆️ Upgrades Grafana to v8.2.3 @frenck (#228)
+- ⬆️ Upgrades Grafana Image Renderer to 3.2.1 @frenck (#229)
diff --git a/grafana/README.md b/grafana/README.md
index b4d4c8b0..7aa240c8 100644
--- a/grafana/README.md
+++ b/grafana/README.md
@@ -50,6 +50,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-v7.2.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-grafana/tree/v7.2.0
+[release-shield]: https://img.shields.io/badge/version-v7.3.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-grafana/tree/v7.3.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
deleted file mode 100644
index edd19b6f..00000000
--- a/grafana/config.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "Grafana",
-  "version": "7.2.0",
-  "slug": "grafana",
-  "description": "The open platform for beautiful analytics and monitoring",
-  "url": "https://github.com/hassio-addons/addon-grafana",
-  "startup": "services",
-  "ingress": true,
-  "ingress_port": 1337,
-  "ingress_stream": true,
-  "panel_icon": "mdi:chart-timeline",
-  "panel_title": "Grafana",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7"
-  ],
-  "map": [
-    "config",
-    "ssl"
-  ],
-  "watchdog": "http://[HOST]:1337/api/health",
-  "options": {
-    "plugins": [],
-    "env_vars": [],
-    "ssl": true,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem"
-  },
-  "ports": {
-    "80/tcp": null
-  },
-  "ports_description": {
-    "80/tcp": "Not required for Ingress"
-  },
-  "schema": {
-    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
-    "plugins": [
-      "str"
-    ],
-    "certfile": "str",
-    "keyfile": "str",
-    "ssl": "bool",
-    "grafana_ingress_user": "str?",
-    "env_vars": [
-      {
-        "name": "match(^GF_([A-Z0-9_])+$)",
-        "value": "str"
-      }
-    ]
-  },
-  "image": "ghcr.io/hassio-addons/grafana/{arch}"
-}
\ No newline at end of file
diff --git a/grafana/config.yaml b/grafana/config.yaml
new file mode 100644
index 00000000..8404ea35
--- /dev/null
+++ b/grafana/config.yaml
@@ -0,0 +1,41 @@
+arch:
+- aarch64
+- amd64
+- armv7
+description: The open platform for beautiful analytics and monitoring
+image: ghcr.io/hassio-addons/grafana/{arch}
+ingress: true
+ingress_port: 1337
+ingress_stream: true
+map:
+- config
+- ssl
+name: Grafana
+options:
+  certfile: fullchain.pem
+  env_vars: []
+  keyfile: privkey.pem
+  plugins: []
+  ssl: true
+panel_icon: mdi:chart-timeline
+panel_title: Grafana
+ports:
+  80/tcp: null
+ports_description:
+  80/tcp: Not required for Ingress
+schema:
+  certfile: str
+  env_vars:
+  - name: match(^GF_([A-Z0-9_])+$)
+    value: str
+  grafana_ingress_user: str?
+  keyfile: str
+  log_level: list(trace|debug|info|notice|warning|error|fatal)?
+  plugins:
+  - str
+  ssl: bool
+slug: grafana
+startup: services
+url: https://github.com/hassio-addons/addon-grafana
+version: 7.3.0
+watchdog: http://[HOST]:1337/api/health