diff --git a/.circleci/config.yml b/.circleci/config.yml
index 72b449ec8bc52..a47db9b5ed10e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -284,12 +284,17 @@ jobs:
             if [[ $CIRCLE_TAG ]]; then
               docker login -u $DOCKER_USER -p $DOCKER_PASS
 
-              docker build -t rocketchat/rocket.chat:latest .
-              docker push rocketchat/rocket.chat:latest
-
-              docker tag rocketchat/rocket.chat:latest rocketchat/rocket.chat:$CIRCLE_TAG
+              docker build -t rocketchat/rocket.chat:$CIRCLE_TAG .
               docker push rocketchat/rocket.chat:$CIRCLE_TAG
 
+              if [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+                docker tag rocketchat/rocket.chat:$CIRCLE_TAG rocketchat/rocket.chat:latest
+                docker push rocketchat/rocket.chat:latest
+              else
+                docker tag rocketchat/rocket.chat:$CIRCLE_TAG rocketchat/rocket.chat:release-candidate
+                docker push rocketchat/rocket.chat:release-candidate
+              fi
+
               exit 0
             fi;