diff --git a/.travis.yml b/.travis.yml
index a7f417e0c6a..dea9da73a3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ script:
 - cd .travis
 - sh ./namefiles.sh
 - cd ..
-- meteor add  rocketchat:livechat rocketchat:hubot 
+- meteor add  rocketchat:livechat rocketchat:hubot
 - meteor build --server demo.rocket.chat  ../build
 - cd .travis
 - sh ./namedemo.sh
diff --git a/.travis/namedemo.sh b/.travis/namedemo.sh
index 67663a3497f..2c32f690d7f 100644
--- a/.travis/namedemo.sh
+++ b/.travis/namedemo.sh
@@ -1,5 +1,5 @@
 cd ../../build
 FILENAME=demo.rocket.chat-`cat version.txt`.tgz
-mv Rocket.Chat.tar.gz  $FILENAME
-ln -s  $FILENAME demo.rocket.chat-v.latest.tgz
+mv Rocket.Chat.tar.gz  "$FILENAME"
+ln -s  "$FILENAME" demo.rocket.chat-v.latest.tgz
 
diff --git a/.travis/namefiles.sh b/.travis/namefiles.sh
index 6f56508c24e..7122c54414f 100644
--- a/.travis/namefiles.sh
+++ b/.travis/namefiles.sh
@@ -1,5 +1,5 @@
 cd ../../build
 FILENAME=rocket.chat-`cat version.txt`.tgz
-mv Rocket.Chat.tar.gz  $FILENAME
-ln -s  $FILENAME rocket.chat-v.latest.tgz
+mv Rocket.Chat.tar.gz  "$FILENAME"
+ln -s  "$FILENAME" "$TRAVIS_BRANCH.rocket.chat-v.latest.tgz"
 
diff --git a/.travis/setbuildinfo.js b/.travis/setbuildinfo.js
index ffef83bd3bc..6387fecef4a 100644
--- a/.travis/setbuildinfo.js
+++ b/.travis/setbuildinfo.js
@@ -8,11 +8,17 @@ var lr = new LineByLineReader(BUILD_INFO_PATH);
 
 var firstline = "";
 
+
 if (process.env.TRAVIS_BUILD_NUMBER)  {
 	var transformVersion = function (firstline) {
 		var versions = firstline.split(".");
+		var verstring = versions[0] + '.' + versions[1] + '.' + process.env.TRAVIS_BUILD_NUMBER + '-'  + process.env.TRAVIS_BRANCH + '\n';
+		if (process.env.TRAVIS_TAG) {
+			verstring = TRAVIS_TAG + '-' + process.env.TRAVIS_BRANCH  + '\n';
+
+		}
 
-		return versions[0] + '.' + versions[1] + '.' + process.env.TRAVIS_BUILD_NUMBER + '\n';
+		return verstring;
 	};
 
 
diff --git a/Dockerfile b/Dockerfile
index 386758a3f39..d43c1d2cd2c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EB
 
 WORKDIR /app
 
-RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
+RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/develop.rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
 &&  tar zxvf ./rocket.chat.tgz \
 &&  rm ./rocket.chat.tgz  \
 &&  cd /app/bundle/programs/server \