diff --git a/build/Jenkinsfile.branch b/build/Jenkinsfile.branch
index 2446270ae2..339c9e3b81 100644
--- a/build/Jenkinsfile.branch
+++ b/build/Jenkinsfile.branch
@@ -124,7 +124,7 @@ pipeline {
           withCredentials([usernamePassword(credentialsId: 'matterbuild-docker-hub', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASS')]) {
             sh 'docker login --username ${DOCKER_USER} --password ${DOCKER_PASS}'
             sh """
-            export TAG='${env.BRANCH_NAME}.${env.BUILD_NUMBER}.${SERVER_GIT_COMMIT}'
+            export TAG='${env.BRANCH_NAME}'
             docker build --no-cache --build-arg MM_PACKAGE=https://releases.mattermost.com/mattermost-platform/${env.BRANCH_NAME}/mattermost-enterprise-linux-amd64.tar.gz -t mattermost/mattermost-enterprise-edition:\${TAG} build
             docker push mattermost/mattermost-enterprise-edition:\${TAG}
             docker logout
@@ -133,6 +133,25 @@ pipeline {
         }
       }
     }
+
+    stage ('Build Docker mattermost-team-edition') {
+      agent {
+        label 'default-mm-builder'
+      }
+      steps {
+        dir('src/github.com/mattermost/mattermost-server') {
+          withCredentials([usernamePassword(credentialsId: 'matterbuild-docker-hub', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASS')]) {
+            sh 'docker login --username ${DOCKER_USER} --password ${DOCKER_PASS}'
+            sh """
+            export TAG='${env.BRANCH_NAME}'
+            docker build --no-cache --build-arg MM_PACKAGE=https://releases.mattermost.com/mattermost-platform/${env.BRANCH_NAME}/mattermost-team-linux-amd64.tar.gz -t mattermost/mattermost-team-edition:\${TAG} build
+            docker push mattermost/mattermost-team-edition:\${TAG}
+            docker logout
+            """
+          }
+        }
+      }
+    }
   }
 
   post {