diff --git a/docker-compose.arm64.yml b/docker-compose.arm64.yml
index db634bc9..29e47cf7 100644
--- a/docker-compose.arm64.yml
+++ b/docker-compose.arm64.yml
@@ -156,7 +156,7 @@ services:
     # Start monitoring
 
     prometheus:
-        image: functions/prometheus:2.7.0-arm64
+        image: prom/prometheus:v2.11.0
         environment:
             no_proxy: "gateway"
         configs:
@@ -183,7 +183,7 @@ services:
                     memory: 200M
 
     alertmanager:
-        image: functions/alertmanager:0.15.0-arm64
+        image: prom/alertmanager:v0.18.0
         environment:
             no_proxy: "gateway"
         command:
diff --git a/docker-compose.armhf.yml b/docker-compose.armhf.yml
index 210f01c8..6fc49239 100644
--- a/docker-compose.armhf.yml
+++ b/docker-compose.armhf.yml
@@ -155,7 +155,7 @@ services:
     # Start monitoring
 
     prometheus:
-        image: functions/prometheus:2.7.0-armhf
+        image: prom/prometheus:v2.11.0
         environment:
             no_proxy: "gateway"
         configs:
@@ -182,7 +182,7 @@ services:
                     memory: 200M
 
     alertmanager:
-        image: functions/alertmanager:0.15.0-armhf
+        image: prom/alertmanager:v0.18.0
         environment:
             no_proxy: "gateway"
         command:
diff --git a/docker-compose.yml b/docker-compose.yml
index 57677231..ad7e8ac0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -155,7 +155,7 @@ services:
     # Start monitoring
 
     prometheus:
-        image: prom/prometheus:v2.7.1
+        image: prom/prometheus:v2.11.0
         environment:
             no_proxy: "gateway"
         configs:
@@ -182,7 +182,7 @@ services:
                     memory: 200M
 
     alertmanager:
-        image: prom/alertmanager:v0.16.1
+        image: prom/alertmanager:v0.18.0
         environment:
             no_proxy: "gateway"
         command: