diff --git a/.travis.yml b/.travis.yml
index 6825b180..55ac215c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,19 +2,15 @@ sudo: required
 language: java
 services:
   - docker
+  - mongo
 install: true
 script:
   - docker build --tag=sdkman/sdkman-cli .
-  - docker run --rm -v $PWD:/usr/src/app -v $HOME/.gradle:/root/.gradle sdkman/sdkman-cli clean test --info
-deploy: 
-    - provider: script
-      script: bin/deploy.sh
-      on:
-          branch: master
-    - provider: script
-      script: bin/deploy.sh
-      on:
-          tags: true
+  - docker run --rm -v $PWD:/usr/src/app -v $HOME/.gradle:/root/.gradle sdkman/sdkman-cli clean test -Dscan --info
+after_success:
+  - docker run --rm -e BINTRAY_USERNAME=$BINTRAY_USERNAME -e BINTRAY_API_KEY=$BINTRAY_API_KEY -e TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER -v $PWD:/usr/src/app -v $HOME/.gradle:/root/.gradle sdkman/sdkman-cli -Penv=production clean assemble bintrayUpload
+  - bin/dopublish nyc3.digitaloceanspaces.com sdkman "dist/sdkman-cli-$TRAVIS_BRANCH+$TRAVIS_BUILD_NUMBER.zip" "build/distributions/sdkman-cli-$TRAVIS_BRANCH+$TRAVIS_BUILD_NUMBER.zip"
+  - bin/release-binary.sh $TRAVIS_BRANCH $TRAVIS_BUILD_NUMBER $MONGO_URL $MONGO_USERNAME $MONGO_PASSWORD
 before_cache:
   - sudo rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:
diff --git a/bin/deploy.sh b/bin/deploy.sh
deleted file mode 100644
index 14fb55fe..00000000
--- a/bin/deploy.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-docker run --rm -e BINTRAY_USERNAME=$BINTRAY_USERNAME -e BINTRAY_API_KEY=$BINTRAY_API_KEY -e TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER -v $PWD:/usr/src/app -v $HOME/.gradle:/root/.gradle sdkman/sdkman-cli -Penv=production clean assemble bintrayUpload
-bin/dopublish nyc3.digitaloceanspaces.com sdkman "dist/sdkman-cli-$TRAVIS_BRANCH+$TRAVIS_BUILD_NUMBER.zip" "build/distributions/sdkman-cli-$TRAVIS_BRANCH+$TRAVIS_BUILD_NUMBER.zip"
-bin/release-binary.sh $TRAVIS_BRANCH $TRAVIS_BUILD_NUMBER $MONGO_URL $MONGO_USERNAME $MONGO_PASSWORD