diff --git a/mattermost/.travis.yml b/mattermost/.travis.yml
index e974eab6c2107d154ca6d8102e150bcd0d20189b..bdd6e6c88ab046bb75c75443304489283ea6e33a 100644
--- a/mattermost/.travis.yml
+++ b/mattermost/.travis.yml
@@ -9,7 +9,7 @@ before_install:
 
 install:
     - eval $BUILD
-    - sleep 10
+    - sleep 30
 
 env:
     - BUILD="docker-compose up -d"
diff --git a/mattermost/app/Dockerfile b/mattermost/app/Dockerfile
index 51c8cc3963b48ebcc639aac52f8a7b14bacc1207..2baa52a9a5ae6bcc83471ac4a24e964ce2693f29 100644
--- a/mattermost/app/Dockerfile
+++ b/mattermost/app/Dockerfile
@@ -5,7 +5,7 @@ ENV PATH="/mattermost/bin:${PATH}"
 RUN apt-get update && apt-get -y install curl netcat
 RUN mkdir -p /mattermost/data
 
-ENV MM_VERSION=3.7.2
+ENV MM_VERSION=3.8.0
 
 RUN curl https://releases.mattermost.com/$MM_VERSION/mattermost-team-$MM_VERSION-linux-amd64.tar.gz | tar -xvz
 
diff --git a/mattermost/app/Dockerfile-enterprise b/mattermost/app/Dockerfile-enterprise
index b52e046eb89593d9099a0bcb82af3d08490e2686..2a4753b3d542d3f2337a3922da11d755551d05e5 100644
--- a/mattermost/app/Dockerfile-enterprise
+++ b/mattermost/app/Dockerfile-enterprise
@@ -5,7 +5,7 @@ ENV PATH="/mattermost/bin:${PATH}"
 RUN apt-get update && apt-get -y install curl netcat
 RUN mkdir -p /mattermost/data
 
-ENV MM_VERSION=3.7.1
+ENV MM_VERSION=3.8.0
 
 RUN curl https://releases.mattermost.com/$MM_VERSION/mattermost-$MM_VERSION-linux-amd64.tar.gz | tar -xvz
 
diff --git a/mattermost/docker-compose.yml b/mattermost/docker-compose.yml
index 5d1622cdb31c5a04376cbe70e144592a1c8698d7..a4e57e094f612acf621fe2ae189b6c058d798c7b 100644
--- a/mattermost/docker-compose.yml
+++ b/mattermost/docker-compose.yml
@@ -24,7 +24,7 @@ services:
     build:
       context: app
       # comment out for team edition
-      dockerfile: Dockerfile-enterprise
+      #dockerfile: Dockerfile-entreprise
     restart: unless-stopped
     volumes:
       - ./volumes/app/mattermost/config:/mattermost/config:rw