diff --git a/docker-compose.yml b/docker-compose.yml
index 9479bf1..07bb524 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -53,7 +53,7 @@ services:
       - 8082:3000
 
   matrix-appservice-discord:
-    image: halfshot/matrix-appservice-discord:latest
+    image: halfshot/matrix-appservice-discord:v1.0.0
     restart: always
     volumes:
       - ./matrix-appservice-discord_data:/data
@@ -119,7 +119,7 @@ services:
 #      - postgres
 
   statping:
-    image: statping/statping
+    image: statping/statping:v0.90.74
     restart: always
     ports:
       - 8086:8080
diff --git a/etherpad/Dockerfile b/etherpad/Dockerfile
index 3e1c33f..d69b655 100644
--- a/etherpad/Dockerfile
+++ b/etherpad/Dockerfile
@@ -1,4 +1,4 @@
-FROM etherpad/etherpad:1.8.7
+FROM etherpad/etherpad:1.8.9
 
 # Change instance settings
 ENV NODE_ENV=production
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 98bd13b..89150b6 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana:7.4.0
+FROM grafana/grafana:7.4.2
 
 ENV GF_SERVER_ROOT_URL=https://grafana.auro.re
 ENV GF_SESSION_COOKIE_SECURE=true
diff --git a/prometheus-alertmanager/Dockerfile b/prometheus-alertmanager/Dockerfile
index f3278ee..c7f1139 100644
--- a/prometheus-alertmanager/Dockerfile
+++ b/prometheus-alertmanager/Dockerfile
@@ -1,3 +1,3 @@
-FROM prom/alertmanager:v0.20.0
+FROM prom/alertmanager:v0.21.0
 
 COPY alertmanager.yml /etc/alertmanager/alertmanager.yml
diff --git a/prometheus-alertmanager/alertmanager.yml b/prometheus-alertmanager/alertmanager.yml
index a8186d4..b611f96 100644
--- a/prometheus-alertmanager/alertmanager.yml
+++ b/prometheus-alertmanager/alertmanager.yml
@@ -6,10 +6,6 @@ global:
   smtp_from: 'alertmanager@example.org'
   #smtp_auth_username: 'alertmanager'
   #smtp_auth_password: 'password'
-  # The auth token for Hipchat.
-  hipchat_auth_token: '1234556789'
-  # Alternative host for Hipchat.
-  hipchat_api_url: 'https://hipchat.foobar.org/'
 
 # The directory from which notification templates are read.
 templates: 
diff --git a/riot/Dockerfile b/riot/Dockerfile
index 66e3a43..a9d6e8f 100644
--- a/riot/Dockerfile
+++ b/riot/Dockerfile
@@ -1,4 +1,4 @@
-FROM vectorim/riot-web:v1.7.20
+FROM vectorim/element-web:v1.7.21
 
 # Customize instance settings and background
 COPY config.json /app/config.json