diff --git a/.travis.yml b/.travis.yml
index 9fca880..befa7e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ script:
 
 before_deploy:
   - bash .travis/create_release.sh
+  - if [ ! -z "$TRAVIS_TAG" ]; then VERSION=$(tr -d "/v/" <<<$TRAVIS_TAG); mvn org.codehaus.mojo:versions-maven-plugin:2.1:set -DnewVersion=${VERSION}; fi
 
 deploy:
   - provider: releases
@@ -45,10 +46,13 @@ deploy:
     file: utPLSQL-cli.zip
     skip_cleanup: true
     on:
+      repository: utPLSQL/utPLSQL-cli
       tags: true
   - provider: bintray
     file: bintray.json
-    user: $BINTRAY_USER
-    key: $BINTRAY_API_KEY
+    user: ${BINTRAY_USER}
+    key: ${BINTRAY_API_KEY}
     dry-run: false
-    on: develop
+    on:
+      repository: utPLSQL/utPLSQL-cli
+      branch: develop
diff --git a/.travis/maven_cfg.sh b/.travis/maven_cfg.sh
index 6017b04..2bacb83 100644
--- a/.travis/maven_cfg.sh
+++ b/.travis/maven_cfg.sh
@@ -13,14 +13,7 @@ else
     sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/
 fi
 
-# Create the settings file with oracle server config.
-# If file already exists, Oracle dependencies were cached on previous build.
-if [ ! -f $MAVEN_CFG/.cached ]; then
-    cp settings.xml $MAVEN_CFG/settings.xml
-    touch $MAVEN_CFG/.cached
-else
-    echo "Using cached maven settings..."
-fi
+cp settings.xml $MAVEN_CFG/settings.xml
 
 # The Java API is not available on a public repository yet, we need to download and install it locally.
 # Always downloading the latest development version.