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: