diff --git a/.travis/deploy_dockerhub.sh b/.travis/deploy_dockerhub.sh
index 201e963..36ac190 100644
--- a/.travis/deploy_dockerhub.sh
+++ b/.travis/deploy_dockerhub.sh
@@ -1,4 +1,10 @@
 #!/bin/sh
-docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-docker push maxking/mailman-web
-docker push maxking/mailman-core
+
+if [[ "$TRAVIS_BRANCH" == "master" ]]
+then
+	docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+	docker push maxking/mailman-web
+	docker push maxking/mailman-core
+else
+	echo "Non-master branch aren't pushed to DockerHub..."
+fi
diff --git a/build.sh b/build.sh
index 5903f51..f5e917a 100755
--- a/build.sh
+++ b/build.sh
@@ -4,13 +4,21 @@ set -e
 
 # Use this script to build docker images.
 
-if [ "$TRAVIS_BRANCH" = "master" ]; then
-    TAG="latest"
+if [[ "$TRAVIS" ]]
+then
+	if [ "$TRAVIS_BRANCH" = "master" ]; then
+		CORE_TAG="latest"
+		WEB_TAG="latest"
+	else
+		CORE_TAG="$TRAVIS_BRANCH"
+		WEB_TAG="$TRAVIS_BRANCH"
+	fi
 else
-    TAG="$TRAVIS_BRANCH"
+    CORE_TAG=`cat core/VERSION`
+    WEB_TAG=`cat web/VERSION`
 fi
 
 DOCKER=docker
 
-$DOCKER build -t maxking/mailman-core:$TAG core/
-$DOCKER build -t maxking/mailman-web:$TAG web/
+$DOCKER build -t maxking/mailman-core:$CORE_TAG core/
+$DOCKER build -t maxking/mailman-web:$WEB_TAG web/
diff --git a/core/VERSION b/core/VERSION
new file mode 100644
index 0000000..17e51c3
--- /dev/null
+++ b/core/VERSION
@@ -0,0 +1 @@
+0.1.1
diff --git a/web/VERSION b/web/VERSION
new file mode 100644
index 0000000..17e51c3
--- /dev/null
+++ b/web/VERSION
@@ -0,0 +1 @@
+0.1.1