diff --git a/app/Dockerfile b/app/Dockerfile
index 8f2acde..b5b1f78 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.6
 
 # Some ENV variables
 ENV PATH="/mattermost/bin:${PATH}"
-ENV MM_VERSION=5.2.0
+ENV MM_VERSION=5.2.1
 
 # Build argument to set Mattermost edition
 ARG edition=enterprise
@@ -33,9 +33,9 @@ RUN mkdir -p /mattermost/data \
 # Get ready for production
 RUN addgroup -g ${PGID} mattermost \
     && adduser -D -u ${PUID} -G mattermost -h /mattermost -D mattermost \
-    && chown -R mattermost:mattermost /mattermost /config.json.save 
+    && chown -R mattermost:mattermost /mattermost /config.json.save
 
-USER mattermost 
+USER mattermost
 
 #Healthcheck to make sure container is ready
 HEALTHCHECK CMD curl --fail http://localhost:8000 || exit 1
diff --git a/contrib/kubernetes/mattermost.deployment.yaml b/contrib/kubernetes/mattermost.deployment.yaml
index 7fc9384..9f27bac 100644
--- a/contrib/kubernetes/mattermost.deployment.yaml
+++ b/contrib/kubernetes/mattermost.deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: mattermost-app
-        image: "mattermost/mattermost-prod-app:4.7.0"
+        image: "mattermost/mattermost-prod-app:5.2.1"
         env:
         - name: DB_HOST
           valueFrom: