diff --git a/mattermost/Dockerfile b/mattermost/Dockerfile
index 0912d22c..a11f8839 100644
--- a/mattermost/Dockerfile
+++ b/mattermost/Dockerfile
@@ -6,17 +6,17 @@ MAINTAINER http://fedoraproject.org/wiki/Cloud
 # based on the work of Takayoshi Kimura <tkimura@redhat.com>
 
 ENV container docker
-ENV MATTERMOST_VERSION 3.0.1
+ENV MATTERMOST_VERSION 3.1.0
 
 # Labels consumed by Red Hat build service
 LABEL Component="mattermost" \
-      Name="fedora-cloud/mattermost-301" \
-      Version="3.0.1" \
+      Name="fedora-cloud/mattermost-310" \
+      Version="3.1.0" \
       Release="1"
 
 # Labels could be consumed by OpenShift
 LABEL io.k8s.description="Mattermost is an open source, self-hosted Slack-alternative" \
-      io.k8s.display-name="Mattermost 3.0.1" \
+      io.k8s.display-name="Mattermost 3.1.0" \
       io.openshift.expose-services="8065:mattermost" \
       io.openshift.tags="mattermost,slack"
 
@@ -30,9 +30,9 @@ RUN dnf update -y && \
     dnf clean all
 
 RUN cd /opt && \
-    curl -LO https://releases.mattermost.com/3.0.1/mattermost-team-3.0.1-linux-amd64.tar.gz && \
-    tar xf mattermost-team-3.0.1-linux-amd64.tar.gz && \
-    rm mattermost-team-3.0.1-linux-amd64.tar.gz && \
+    curl -LO https://releases.mattermost.com/3.1.0/mattermost-team-3.1.0-linux-amd64.tar.gz && \
+    tar xf mattermost-team-3.1.0-linux-amd64.tar.gz && \
+    rm mattermost-team-3.1.0-linux-amd64.tar.gz && \
     mkdir /opt/mattermost/data && \
     chmod 777 /opt/mattermost/config /opt/mattermost/logs /opt/mattermost/data
 
@@ -44,4 +44,4 @@ EXPOSE 8065
 
 WORKDIR /opt/mattermost
 
-CMD bin/mattermost-launch.sh
+CMD [ "bin/mattermost-launch.sh" ]
diff --git a/mattermost/README.md b/mattermost/README.md
index 64e789f3..cbbdc064 100644
--- a/mattermost/README.md
+++ b/mattermost/README.md
@@ -1,6 +1,6 @@
-# Mattermost 3.0.1
+# Mattermost 3.1.0
 
-This is a Mattermost 3.0.1 docker container images. As the Mattermost community
+This is a Mattermost 3.1.0 docker container images. As the Mattermost community
 only provides a dev version and releases, but no link to the latest release, we
 will use a specific version of Mattermost for this docker container image. Please
 check [Mattermost release page](http://www.mattermost.org/download/) if updates
@@ -27,14 +27,14 @@ to start the Mattermost container.
 
 ### Building
 
-Just a simple `docker build --rm --tag <username>/mattermost:3.0.1 .` will do it.
+Just a simple `docker build --rm --tag <username>/mattermost:3.1.0 .` will do it.
 
 ## Running
 
 Start a MySQL container first, mattermost will need it: `docker run -ti --name db -e MYSQL_ALLOW_EMPTY_PASSWORD=true -e MYSQL_USER=mmuser -e MYSQL_PASSWORD=mostest -e MYSQL_DATABASE=mattermost_test mariadb` This will use a mariadb from hub.docker.io. user, password and database must
 match what you put in `config.json`.
 
-Now run the Mattermost container itself and link it to the mysql container: `docker run --detach --publish 8065:8065 --link db:mysql --name mattermost <username>/mattermost:3.0.1`
+Now run the Mattermost container itself and link it to the mysql container: `docker run --detach --publish 8065:8065 --link db:mysql --name mattermost <username>/mattermost:3.1.0`
 
 ## Usage