diff --git a/.travis.yml b/.travis.yml
index 6e13ba0f8..4b1ee63d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,7 @@ before_install:
   - chmod +x gradlew
 
 # override install to skip 'gradle assemble'
-install:
-  - true
+install: true
 
 env:
   global:
@@ -21,34 +20,21 @@ env:
     - JADX_LAST_TAG=$(git describe --abbrev=0 --tags)
     - JADX_VERSION="${JADX_LAST_TAG:1}-b$TRAVIS_BUILD_NUMBER-$(git rev-parse --short HEAD)"
 
-matrix:
+jdk:
+  - openjdk8
+  - oraclejdk8
+  - openjdk11
+
+script: ./gradlew clean build
+
+jobs:
   include:
-    - env: JDK=oracle-8
-      jdk: oraclejdk8
-    - env: JDK=openjdk11
-      jdk: openjdk11
+    - stage: deploy-unstable
+      jdk: openjdk8
+      if: branch = master AND env(BINTRAY_USER) IS present
+      script: bash scripts/travis-master.sh
 
-script:
-  - java -version
-  - ./gradlew clean build
-
-deploy:
-  - provider: script
-    skip_cleanup: true
-    on:
-      branch: master
-      tags: false
-      condition: $JDK = oracle-8
-    script: bash scripts/travis-master.sh
-
-  - provider: script
-    skip_cleanup: true
-    on:
-      branch: release
-      tags: false
-      condition: $JDK = oracle-8
-    script: bash scripts/travis-release.sh
-
-notifications:
-  email:
-    - skylot@gmail.com
+    - stage: deploy-release
+      jdk: openjdk8
+      if: branch = release AND env(GH_TOKEN) IS present
+      script: bash scripts/travis-release.sh
diff --git a/scripts/bintray-upload.sh b/scripts/bintray-upload.sh
index 3a6a35783..a8982f981 100644
--- a/scripts/bintray-upload.sh
+++ b/scripts/bintray-upload.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
-set -xe
+set -e
 
 export JFROG_CLI_OFFER_CONFIG=false
 export JFROG_CLI_LOG_LEVEL=DEBUG
 
 npm install -g jfrog-cli-go
 
-TARGET=skylot/jadx/${BINTRAY_PACKAGE}/v${JADX_VERSION}
-CREDENTIALS="--user=skylot --key=${BINTRAY_KEY}"
+TARGET=${BINTRAY_USER}/jadx/${BINTRAY_PACKAGE}/v${JADX_VERSION}
+CREDENTIALS="--user=${BINTRAY_USER} --key=${BINTRAY_KEY}"
 
 jfrog bt version-create ${TARGET} ${CREDENTIALS} --desc=${JADX_VERSION}
 jfrog bt upload 'build/jadx.*\.(zip|exe)' ${TARGET} ${CREDENTIALS} --regexp=true --publish=true
diff --git a/scripts/travis-master.sh b/scripts/travis-master.sh
index 75c7b0da0..07c77ec7f 100644
--- a/scripts/travis-master.sh
+++ b/scripts/travis-master.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -xe
+set -e
 
 # upload coverage to codecov
 ./gradlew clean build jacocoTestReport
diff --git a/scripts/travis-release.sh b/scripts/travis-release.sh
index bdad6ef2f..49c7ba64f 100644
--- a/scripts/travis-release.sh
+++ b/scripts/travis-release.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -xe
+set -e
 
 npm install -g semantic-release
 npm install -g semantic-release/exec