diff --git a/.travis.yml b/.travis.yml
index c7c970aa0..5d84a39f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,14 @@
 language: java
 jdk:
 - oraclejdk8
+branches:
+  only:
+    - master
+before_deploy:
+  - git config --global user.email ${GITHUB_EMAIL}
+  - git config --global user.name ${GITHUB_NAME}
+  - git tag ${HMCL_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}
+  - git push -q ${REPO} --tags
 deploy:
   provider: releases
   api_key: ${DEPLOY_REPO}
@@ -12,8 +20,7 @@ deploy:
   - HMCSM/build/libs/HMCSM-${HMCSM_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}.exe
   - HMCSM/build/libs/HMCSM-${HMCSM_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}-MacOSApp.zip
   on:
-    tags: true
-    all_branches: true
+    tags: false
   skip_cleanup: true
 install: echo "skip 'gradle assemble' step"
 script: gradle build --continue