diff --git a/playbooks/roles/grafana/templates/docker-compose.yaml.j2 b/playbooks/roles/grafana/templates/docker-compose.yaml.j2
index 2a14ea6b0d..f8be3cc4a5 100644
--- a/playbooks/roles/grafana/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/grafana/templates/docker-compose.yaml.j2
@@ -5,8 +5,7 @@ version: '2'
 services:
   grafana:
     restart: always
-    # Temporarily pin to 10.2.2 instead of latest due to selector errors
-    image: docker.io/grafana/grafana-oss:10.2.2
+    image: docker.io/grafana/grafana-oss:10.4.14
     network_mode: host
     environment:
       GF_SERVER_DOMAIN: 'grafana.opendev.org'
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index e91c27248b..3d716193b0 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -734,7 +734,7 @@
       nodes:
         - <<: *bridge_node_x86
         - name: grafana01.opendev.org
-          label: ubuntu-focal
+          label: ubuntu-noble
       groups:
         - <<: *bastion_group
     vars: