diff --git a/.travis.yml b/.travis.yml
index 67664c1889..80654e36b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,11 @@ script:
       export DOCKER_HUB_STORK_TAG="${TRAVIS_BRANCH}"-dev
       export DOCKER_HUB_STORK_TEST_TAG="${TRAVIS_BRANCH}"-dev
       export DOCKER_HUB_CMD_EXECUTOR_TAG="${TRAVIS_BRANCH}"-dev
+    elif [ "${TRAVIS_TAG}" != "" ]; then
+      TRAVIS_TAG="${TRAVIS_TAG:1}"
+      export DOCKER_HUB_STORK_TAG="${TRAVIS_TAG}"-dev
+      export DOCKER_HUB_STORK_TEST_TAG="${TRAVIS_TAG}"-dev
+      export DOCKER_HUB_CMD_EXECUTOR_TAG="${TRAVIS_TAG}"-dev
     else
       export DOCKER_HUB_STORK_TAG=`git rev-parse --short HEAD`
       export DOCKER_HUB_STORK_TEST_TAG=`git rev-parse --short HEAD`