diff --git a/pica-mattermost/Dockerfile b/pica-mattermost/Dockerfile
index 1867c5b17bd0fbb139eec78c4337324c75bec3a7..15a969f63e1a0533b9388c22fba0d4473e3dc8a5 100644
--- a/pica-mattermost/Dockerfile
+++ b/pica-mattermost/Dockerfile
@@ -4,7 +4,7 @@ FROM alpine:3.11
 ENV PATH="/mattermost/bin:${PATH}"
 
 # Picasoft : change these values. The team version is used by default
-ENV MM_VERSION=5.20.1
+ENV MM_VERSION=5.21.0
 # Get these ids with the output of `id mattermost` on the VM hosting the app
 ARG PUID=5000
 ARG PGID=5000
diff --git a/pica-mattermost/docker-compose.yml b/pica-mattermost/docker-compose.yml
index 44d9cd1ef1d1a472f5771fd34abbd5ba9e7f3828..0a56c85d43720f3a7d160dcbe2ea8f901a81cf26 100644
--- a/pica-mattermost/docker-compose.yml
+++ b/pica-mattermost/docker-compose.yml
@@ -16,7 +16,7 @@ volumes:
 
 services:
   mattermost:
-    image: registry.picasoft.net/pica-mattermost:5.20.1
+    image: registry.picasoft.net/pica-mattermost:5.21.0
     container_name: mattermost-app
     links:
       - mattermost-db:mattermost-db