diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a556b2bf1..502ae8b71 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
     grafana:
-      image: grafana/grafana:7.3.4
+      image: grafana/grafana:7.3.6
       hostname: grafana
       depends_on:
         - graphite
@@ -40,7 +40,7 @@ services:
         # - /absolute/path/to/graphite/conf/storage-aggregation.conf:/opt/graphite/conf/storage-aggregation.conf
         # - /absolute/path/to/graphite/conf/carbon.conf:/opt/graphite/conf/carbon.conf
     grafana-setup:
-      image: sitespeedio/grafana-bootstrap:14.0.0
+      image: sitespeedio/grafana-bootstrap:16.0.0
       links:
         - grafana
       environment: