diff --git a/.travis.yml b/.travis.yml
index f0ce4095b..a06be4676 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,12 @@ stages:
 
 env:
   global:
+    - FORCE_DEPLOY=false
     - NODE_VERSION=8
     - DEPLOY_REPO=Taskana/taskana
+    - VERSION=v`mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.6.0:exec -f ./lib`
   matrix:
-    - DB=H2 
+    - DB=H2
     - DB=DB2_10_5
     - DB=DB2_11_1
     - DB=POSTGRES_10_4
@@ -47,22 +49,7 @@ jobs:
           && mvn clean install -q -f lib -DskipTests -Dmaven.javadoc.skip=true
           && mvn clean install -q -f rest -DskipTests -Dmaven.javadoc.skip=true
     - stage: "Release / Deploy"
-      script: 
-        - ci/change_version.sh -i -m "lib/ rest/" -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
-          && ci/copy-rest-spring.sh $TRAVIS_TAG
-          && ci/commitPoms.sh lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
-      deploy: 
-        provider: cloudfoundry 
-        username: tobias.schaefer@novatec-gmbh.de
-        password:
-          secure: dQh3e8Zhi2ucd5NcxHZ337Ku2SFrt0qA8lghtExQU5bcdFziqYKJsVFdD19hNQE6DOZT8FV9OHTB3odZSvV7aa38sq4KDwzJVVitIyU3eNZP0S5AqAv0eKitqQhjY7rnjBIkgMQ2rGTZlAL9g/CQWPlB4rnUPLXv/7+pZP29M3OPK0hyIPw9I0FfU02cM+R2z8SYPRr4MYYbdsTdJeJz+1sKWwQiD4bDE/Kmcs7BALTZ3/HFmu2Kjxk7soERSpXlMvKDkHHJCJMSjQI6zT5Ja6yg4SgOgccLZKuaPwF+8a7RKPOtW+H74zzO/IE9FGimlRKFGHhoFmQh0oI1sMkhRyIH0n/rkCVzI6B8XjDBEdaRjfHZbAkrjapuvhLwSxyklut3CknbSxfgAo8tZefsGVETD1rYkfLA207bkxt6Wk+X1d2pCRFkUoeTjcB+IkqvftTJvTX5vyt927w0pyx/xg9gxBLA3bqzhRL7rwgXgqgrxNUDFT3nxExecPpdEinyVf+jQxmrb1uw1WEFM+dLjA3tByxMEy7PfnfqTvUs8dvs4em1Vln+N5K1+OqU93ze3FmPMmqY3/4r63qdVACtCqHlfGC3HQPUi6fWmBzVNhZ9rF6FJvkECTkvLklnOB9MIoneGk2v46slveUsxKSz985A2aMkYNO+p1VozS8rAfg=
-        api: https://api.ng.bluemix.net 
-        organization: '"NovaTec Consulting GmbH"' 
-        space: Taskana
-        on:
-          all_branches: true
-      if: repo = env(DEPLOY_REPO) AND tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
-    - stage: "Release / Deploy"
+      name: "Release stage"
       script:
         - ci/release.sh lib/taskana-core $TRAVIS_TAG
           && ci/release.sh lib/taskana-spring $TRAVIS_TAG
@@ -70,3 +57,26 @@ jobs:
           && ci/release.sh web/ $TRAVIS_TAG
           && ci/release.sh rest/taskana-rest-spring $TRAVIS_TAG
       if: repo = env(DEPLOY_REPO) AND (tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ OR branch = master) AND type != pull_request
+    - stage: "Release / Deploy"
+      name: "Update Pom's stage"
+      script: 
+        - ci/change_version.sh -i -m "lib/ rest/" -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
+          && ci/commitPoms.sh lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
+      if: repo = env(DEPLOY_REPO) AND tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
+    - stage: "Release / Deploy"
+      name: "Deploy stage"
+      script:
+        - if [[ $FORCE_DEPLOY = true ]]
+            then ci/copy-rest-spring.sh $VERSION;
+            else ci/copy-rest-spring.sh $TRAVIS_TAG;
+          fi  
+      deploy:
+        provider: cloudfoundry
+        username: $BLUEMIX_ACCOUNT
+        password: $BLUEMIX_ACCOUNT_PASSWORD
+        api: https://api.ng.bluemix.net
+        organization: "NovaTec Consulting GmbH"
+        space: Taskana
+        on:
+          all_branches: true
+      if: branch = master AND ((repo = env(DEPLOY_REPO) AND tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$) OR (env(FORCE_DEPLOY) = true))
diff --git a/ci/copy-rest-spring.sh b/ci/copy-rest-spring.sh
index b87540dbf..6691eaa81 100755
--- a/ci/copy-rest-spring.sh
+++ b/ci/copy-rest-spring.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e # fail fast
 
-if [[ ! "$1" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then 
+if [[ ! "$1" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-SNAPSHOT)?$ ]]; then 
   echo "missing tag" >&2 
   exit 1
 fi