diff --git a/.travis.yml b/.travis.yml
index b8fccc2..c92a4b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,6 @@ before_deploy:
 - go get github.com/laher/goxc
 - goxc -t -bc="linux darwin windows"
 - goxc -d=./ -wd=./cmd/tusd -bc="linux darwin windows" -build-ldflags="-X main.VersionName=$TRAVIS_TAG -X main.GitCommit=$TRAVIS_COMMIT -X 'main.BuildDate=$(date --utc)'"
-- .infra/scripts/rebuild-env.sh
-- if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then (make frey && frey setup --force-yes --projectDir .infra); else echo "Skipping deploy fornon-master/PRs"; fi
 deploy:
   provider: releases
   api_key:
@@ -48,6 +46,9 @@ deploy:
   - snapshot/tusd_windows_amd64.zip
   skip_cleanup: true
   on:
-    # tags: true
+    tags: true
     go: 1.5
     repo: tus/tusd
+after_deploy:
+- .infra/scripts/rebuild-env.sh
+- if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then (make frey && frey setup --force-yes --projectDir .infra); else echo "Skipping deploy for non-master/PRs"; fi