diff --git a/community/grafana-frontend/APKBUILD b/community/grafana-frontend/APKBUILD
index e8548585003139605be861d481f109f00bb79dde..1b1b4d69a70f6c148e109f11f53e33c2e8bc2adf 100644
--- a/community/grafana-frontend/APKBUILD
+++ b/community/grafana-frontend/APKBUILD
@@ -12,8 +12,8 @@
 # This is also a reason why we use prebuilt frontend archive.
 
 pkgname=grafana-frontend
-pkgver=9.0.3
-pkgrel=1
+pkgver=9.0.4
+pkgrel=0
 pkgdesc="Open source, feature rich metrics dashboard and graph editor (frontend files)"
 url="https://grafana.com"
 arch="noarch"
@@ -28,5 +28,5 @@ package() {
 }
 
 sha512sums="
-1704dbddc22c9f6f07388df8ccaf4162c5cb93980aa3ca4bf8b2f0f8d1fe57385232da08bb621b64ab9fb249b37e806c1a8cc214f09ae657ede7945d5d1caf86  grafana-frontend-9.0.3-bin.tar.gz
+8a70f892c669e314e297667623db609dfe49f5866de4ca20a139a50c8589c2e59584f0b66342ebafa73230a074a8a424cbc37430637f5a2ec454605f48806e90  grafana-frontend-9.0.4-bin.tar.gz
 "
diff --git a/community/grafana/APKBUILD b/community/grafana/APKBUILD
index 973999cce94a13e0233b5656bfedf6a77af1906d..0f7a168198efdad59744132d4e816261a6cfdfad 100644
--- a/community/grafana/APKBUILD
+++ b/community/grafana/APKBUILD
@@ -4,10 +4,10 @@
 # Keep in sync with grafana-frontend.
 
 pkgname=grafana
-pkgver=9.0.3
-pkgrel=1
-_commit=023f9251a9 # git rev-parse --short HEAD
-_stamp=1657831664 # git --no-pager show -s --format=%ct
+pkgver=9.0.4
+pkgrel=0
+_commit=c256012971 # git rev-parse --short HEAD
+_stamp=1658327037 # git --no-pager show -s --format=%ct
 pkgdesc="Open source, feature rich metrics dashboard and graph editor"
 url="https://grafana.com"
 # x86, armhf, armv7: many test failures, for example https://github.com/grafana/grafana/issues/26389
@@ -97,7 +97,7 @@ package() {
 }
 
 sha512sums="
-f63a8bc63a54455254f9155ea2ed3348f8249776a6e18059833afa5452337ddb28c4cced2d29d8cd401074136448405987acbcea096ba2b10b60b1db3d9f23d3  grafana-9.0.3.tar.gz
+01e46b91aa043e9f8dcb32d0f5a8dc0d2630811cebb62f10fce7a22fa8aa768090d120a072da86a35e4a11cbf6128609615274ae90437f48513efd252ee44b68  grafana-9.0.4.tar.gz
 98494f722fac4f8a28c33e2efda6f49896d137ede402f29f621712af5d575d29e4efcb0f920be5e04c269b8552cf8b31512673b9743bc7c4ce430882616ca4af  grafana.initd
 c2d9896ae9a9425f759a47aeab42b7c43b63328e82670d50185de8c08cda7b8df264c8b105c5c3138b90dd46e86598b16826457eb3b2979a899b3a508cbe4e8c  grafana.confd
 de9cbf41fcaffc73422298f6d32fc95358657dcacf9fa6e991e45f472aec894c3be406407ab289615a7cccc14a9014dd654a376470534adff009180389f64fa6  fix-dev-dashboards-tests.patch