diff --git a/.travis.yml b/.travis.yml
index 8448469..2627af4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,20 @@
 language: groovy
 jdk:
-  - oraclejdk8
+- openjdk8
 cache:
   directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-
+  - "$HOME/.gradle/caches/"
+  - "$HOME/.gradle/wrapper/"
 before_install:
-  - chmod +x ./gradlew
-
+- chmod +x ./gradlew
 script:
-  - ./gradlew --no-daemon assemble
-
-script:
-  - ./gradlew --no-daemon check
+- "./gradlew --no-daemon check"
+deploy:
+  provider: script
+  script: "./gradlew clean assemble bintrayUpload --debug"
+  on:
+    tags: true
+env:
+  global:
+  - secure: UNwJTEHomlqu4qFYGEagPMTNjPZ1BDG4TVtHgWpEPos/BxTLQRlOEDGzrrQS+OUxsecBHthgxRwBBfZr4POQiaNygrMjTVwT53HVhE45bNXPQG6sgwgzYW1ABpWhUbNVSeUyXeJQTTZX9QLqwBlap7HZV/fgZYGieunXtEhsh524NrpnbZyr42ikhhQjdiAPzY4P59eEgSe2qdFqNFKQCX4J0uqjmuUDznskLsozCI5FZ4/z7BhcnOoczD3fMPZsdjWnn6C2WcXr5hzz0A+FqBOaMNkCyGqk6OAcuHMtR+8gByayhAZpzAKLPv6Tx7CGX4pmr9dClyfzJ7AozqyFCpcoEBw/n7QtAQhOu4NG04KvADjSdqowlvO+vvqAXC1FI+lzFHEEL5gGxxqBwf3aqGEDNzF8wbcRM42450VxCq3RNZW3Xns+GW/Whu7wJP2HZh0ygPdI9VlNtweLeV5rLcdw+Qv1JGEqpLNKMnfpm46BdEdOHQpNtNLyrxfzasVeo2LnJ3oDtpqMKt1KvBqKzUAqv/eNpDfgcU1mSNB7NhTN3+3ty9VAz8woce6LR5azWfYHlDZlnz1BRJjroqdnVVq8swhY6vzn9eibP/Jm9LfGqRRmTLOc8ZPseStjOY0HS88ct6BcwKGMAIGIMANVSHLeOVM69+Uhq/y4Owqc8a8=
+  - secure: e9440gJtpLNkO+72IW2t6a1EaQ96uJBjnP2phdLSSAX21ysKJIHuJkPxQ0fMCb3hlV3DkSV0itV1m80XrHib0kS9sMoRGRlq6VVjp2Xo6dMLcZx2ZEuZXi+CifXBQo0ZRqrsoiytPqpET2WUwY1jEhRcrrVtoZQQHXE+YUleOy6XIb8bfNM4Lsbx/HgMI+3F03Tm2VtKVl9WHi6EH2Ae67kjJjxfNd56J5HqC8o3aq+ajjAIeIpjN5uNhf0pnpQtleL59NRb0PQNBmpFMbg0V5xRiUNJz6kqX4ypApW8nNhvb0CqtzDJA/7HThVKhdmwG0pU4LjdtBj9lo+EANHtP85+jPfsO2hGEbqsHEh0V2KyobDdLVqmEfooitdA3LfJ58De9KEC4EMaPa7eybakuKNnxZDja84tnif95ExK/2Okn2zac3yaxQGD1KbHQNRPk2gddZUBKYws+ez2QFfEi7fr63U28Xo8w3XJFAYoUFEwkH7noUB2p9VARDKnYolRarLED9Za5XSgGzAsNCXKKm9R1d+Rxtk7nhbNyosxkYKn+bB3kFXaTjidJoYyMesxMey79/MHdnxQkmP2WPseAFQNqplu+kV8c3wn8mb1vzglt90oFbreBGSvTjmK+zioHUs5p9crry7lHOadQl512fEg1ia3SJiCgM/OLTeJHMc=
diff --git a/README.md b/README.md
index 5e03536..c3649a7 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,12 @@ For more information on this topic see: http://ui-patterns.com/patterns/Wizard
 ## Installation
 
 
-1. `wizard` is available in the [CUBA marketplace](https://www.cuba-platform.com/marketplace)
+1. `wizard` is available in the [CUBA marketplace](https://www.cuba-platform.com/marketplace/wizard)
 2. Select a version of the add-on which is compatible with the platform version used in your project:
 
 | Platform Version | Add-on Version |
 | ---------------- | -------------- |
+| 6.9.x            | 0.2.x          |
 | 6.8.x            | 0.1.x          |
 
 
diff --git a/RELEASE.md b/RELEASE.md
index 3fb1afc..65658dd 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -7,9 +7,6 @@ To create a release of this application component do the following:
 
 1. commit & push your changes to Github
 2. wait for travis to be build
-3. switch isSnapshot in build.gradle to false (make sure it is currently 0.3.1, isSnapshot = true)
-4. commit & push your changes to Github
-5. ./tag-release.sh 0.3.1 (which creates a git tag and pushes it to Github)
-6. Update the title "version 0.3.1" and description of the tag in the Github UI
-7. ./upload-to-repository.sh <<MY_REPO_USERNAME>> <<MY_REPO_PASSWORD>> (optional <<MY_REPO_URL>> as third parameter, otherwise will use bintray)
-
+3a. `./gradlew release -Prelease.useAutomaticVersion=true` to update to next patch version (0.3.2)
+3b.  `./gradlew release -Prelease.useAutomaticVersion=true -Prelease.releaseVersion=0.4.0 -Prelease.newVersion=0.4.1-SNAPSHOT` to update to next minor version (0.4.0)
+4. Update the title "version 0.3.1" and description of the tag in the Github UI
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 13e9dc1..c7deced 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 
 buildscript {
-    ext.cubaVersion = '6.8.9'
+    ext.cubaVersion = '6.9.8'
     repositories {
-        
+        mavenCentral()
         maven {
             url 'https://repo.cuba-platform.com/content/groups/work'
             credentials {
@@ -19,6 +19,11 @@ buildscript {
     }
 }
 
+
+plugins {
+    id 'net.researchgate.release' version '2.1.2'
+}
+
 def modulePrefix = 'wizard'
 
 def globalModule = project(":${modulePrefix}-global")
@@ -26,7 +31,7 @@ def coreModule = project(":${modulePrefix}-core")
 def guiModule = project(":${modulePrefix}-gui")
 def webModule = project(":${modulePrefix}-web")
 
-def servletApi = 'org.apache.tomcat:tomcat-servlet-api:8.0.26'
+def servletApi = 'javax.servlet:javax.servlet-api:3.1.0'
 
 
 apply(plugin: 'idea')
@@ -35,8 +40,8 @@ apply(plugin: 'cuba')
 cuba {
     artifact {
         group = 'de.diedavids.cuba.wizard'
-        version = "0.1.0"
-        isSnapshot = false
+        version = project.properties['version'].replaceAll('-SNAPSHOT', '')
+        isSnapshot = project.properties['version'].contains('-SNAPSHOT')
     }
     tomcat {
         dir = "$project.rootDir/deploy/tomcat"
@@ -245,9 +250,6 @@ configure(webModule) {
 }
 
 
-
-
-
 task undeploy(type: Delete, dependsOn: ":${modulePrefix}-web:cleanConf") {
     delete("$cuba.tomcat.dir/shared")
     delete("$cuba.tomcat.dir/webapps/${modulePrefix}-core")
@@ -269,4 +271,4 @@ task wrapper(type: Wrapper) {
     gradleVersion = '4.3.1'
 }
 
-apply from: 'extra.gradle'
+
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..f08ffbc
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+version=0.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/tag-release.sh b/tag-release.sh
deleted file mode 100755
index 059dd9a..0000000
--- a/tag-release.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ -z "$1" ]]
-  then
-    echo "Define tag version. Usage: ./tag-release.sh 0.3.1"
-
-  else
-    git tag -a $1 -m "version $1"
-    git push origin $1
-    git tag
-fi
diff --git a/upload-to-repository.sh b/upload-to-repository.sh
deleted file mode 100755
index 414ad9c..0000000
--- a/upload-to-repository.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-
-./gradlew clean assemble bintrayUpload
-