diff --git a/docker-compose-pi.yaml b/docker-compose-pi.yaml
index 0e30359296..23b7711a40 100644
--- a/docker-compose-pi.yaml
+++ b/docker-compose-pi.yaml
@@ -18,7 +18,7 @@ services:
         build:
             context: https://github.com/faucetsdn/docker-prometheus.git
             dockerfile: Dockerfile.pi
-        image: 'faucet/prometheus-pi:2.3.1'
+        image: 'faucet/prometheus-pi:2.4.0'
         user: 'root'
         ports:
             - '9090:9090'
@@ -32,7 +32,7 @@ services:
 
     grafana:
         restart: always
-        image: 'fg2it/grafana-armhf:v5.1.4'
+        image: 'raymondmm/grafana:5.2.2-slim-arm32v7'
         user: 'root'
         ports:
             - '3000:3000'
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0c0ae5de2f..d1c4dcc195 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
 
     prometheus:
         restart: always
-        image: 'prom/prometheus:v2.3.1'
+        image: 'prom/prometheus:v2.4.0'
         user: 'root'
         ports:
             - '9090:9090'
@@ -30,7 +30,7 @@ services:
 
     grafana:
         restart: always
-        image: 'grafana/grafana:5.2.1'
+        image: 'grafana/grafana:5.2.4'
         user: 'root'
         ports:
             - '3000:3000'