diff --git a/.travis.yml b/.travis.yml
index c167ebb20..c5406c8eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,11 +19,12 @@ stages:
 env:
   global:
     - NODE_VERSION=8
+    - DEPLOY_REPO=Taskan/taskana
   matrix:
     - DB=H2 
     - DB=DB2_10_5
     - DB=DB2_11_1
-    - DB=POSTGRES
+    - DB=POSTGRES_10_4
 
 stage: Test
 script:
@@ -60,7 +61,7 @@ jobs:
         space: Taskana
         on:
           all_branches: true
-      if: tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
+      if: repo = $DEPLOY_REPO AND tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
     - stage: "Release / Deploy"
       script:
         - ci/release.sh lib/taskana-core $TRAVIS_TAG
@@ -68,4 +69,4 @@ jobs:
           && ci/release.sh lib/taskana-cdi $TRAVIS_TAG
           && ci/release.sh web/ $TRAVIS_TAG
           && ci/release.sh rest/taskana-rest-spring $TRAVIS_TAG
-      if: (tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ OR branch = master) AND type != pull_request
+      if: repo = $DEPLOY_REPO AND (tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ OR branch = master) AND type != pull_request
diff --git a/ci/prepare_db.bat b/ci/prepare_db.bat
new file mode 100644
index 000000000..be0478bdd
--- /dev/null
+++ b/ci/prepare_db.bat
@@ -0,0 +1,152 @@
+@ECHO OFF
+SETLOCAL
+SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
+
+:MENU
+    ECHO.
+    ECHO -----------------------------------------------------
+    ECHO PRESS a number to select your task - anthing to EXIT.
+    ECHO -----------------------------------------------------
+    ECHO.
+    ECHO 1 - Start DB2 10.5
+    ECHO 2 - Stop  DB2 10.5
+    ECHO.
+    ECHO 3 - Start DB2 11.1
+    ECHO 4 - Stop  DB2 11.1
+    ECHO.
+    ECHO 5 - Start POSTGRES 10.4
+    ECHO 6 - Stop  POSTGRES 10.4
+    ECHO.
+    ECHO 7 - Stop all
+    ECHO 8 - Remove %PROP_FILE%
+    ECHO.
+    SET /P MENU=Select task then press ENTER:
+    ECHO.
+    IF [%MENU%]==[1] GOTO START_DB2_10_5
+    IF [%MENU%]==[2] GOTO STOP_DB2_10_5
+    IF [%MENU%]==[3] GOTO START_DB2_11_1
+    IF [%MENU%]==[4] GOTO STOP_DB2_11_1
+    IF [%MENU%]==[5] GOTO START_POSTGRES_10_4
+    IF [%MENU%]==[6] GOTO STOP_POSTGRES_10_4
+    IF [%MENU%]==[7] GOTO STOP_ALL
+    IF [%MENU%]==[8] GOTO REMOVE_PROP
+    EXIT /B
+
+:START_DB2_10_5
+    ECHO ---
+    docker ps -aq -f name=^/taskana-db2_10_5$ -f status=running > %TEMP%\temp
+    SET /P CONTAINER_RUNNING=< %TEMP%\temp
+    docker ps -aq -f name=^/taskana-db2_10_5$ > %TEMP%\temp
+    SET /P CONTAINER_EXISTS=< %TEMP%\temp
+    del %TEMP%\temp
+
+    IF NOT DEFINED CONAINER_RUNNING IF DEFINED CONTAINER_EXISTS (
+        ECHO docker start taskana-db2_10_5
+        docker start taskana-db2_10_5
+    )
+
+    IF NOT DEFINED CONAINER_RUNNING IF NOT DEFINED CONTAINER_EXISTS (
+        ECHO docker run -d -p 50100:50000 --name taskana-db2_10_5 taskana/db2:10.5 -d
+        docker run -d -p 50100:50000 --name taskana-db2_10_5 taskana/db2:10.5 -d
+    )
+
+    ECHO jdbcDriver=com.ibm.db2.jcc.DB2Driver > %PROP_FILE%
+    ECHO jdbcUrl=jdbc:db2://localhost:50100/tskdb >> %PROP_FILE%
+    ECHO dbUserName=db2inst1 >> %PROP_FILE%
+    ECHO dbPassword=db2inst1-pwd >> %PROP_FILE%
+    ECHO schemaName=taskana >> %PROP_FILE%
+    ECHO ---
+    GOTO MENU
+
+:STOP_DB2_10_5
+    ECHO ---
+    ECHO docker stop taskana-db2_1 
+    docker stop taskana-db2_1
+    ECHO ---
+    GOTO MENU
+
+:START_DB2_11_1
+    ECHO ---
+    docker ps -aq -f name=^/taskana-db2_11_1$ -f status=running > %TEMP%\temp
+    SET /P CONTAINER_RUNNING=< %TEMP%\temp
+    docker ps -aq -f name=^/taskana-db2_11_1$ > %TEMP%\temp
+    SET /P CONTAINER_EXISTS=< %TEMP%\temp
+    del %TEMP%\temp
+
+    IF NOT DEFINED CONAINER_RUNNING IF DEFINED CONTAINER_EXISTS (
+        ECHO docker start taskana-db2_11_1
+        docker start taskana-db2_11_1
+    )
+
+    IF NOT DEFINED CONAINER_RUNNING IF NOT DEFINED CONTAINER_EXISTS (
+        ECHO docker run -d -p 50101:50000 --name taskana-db2_11_1 taskana/db2:11.1 -d
+        docker run -d -p 50101:50000 --name taskana-db2_11_1 taskana/db2:11.1 -d
+    )
+
+    ECHO jdbcDriver=com.ibm.db2.jcc.DB2Driver > %PROP_FILE%
+    ECHO jdbcUrl=jdbc:db2://localhost:50101/tskdb >> %PROP_FILE%
+    ECHO dbUserName=db2inst1 >> %PROP_FILE%
+    ECHO dbPassword=db2inst1-pwd >> %PROP_FILE%
+    ECHO schemaName=taskana >> %PROP_FILE%
+    ECHO ---
+    GOTO MENU
+
+:STOP_DB2_11_1
+    ECHO ---
+    ECHO docker stop taskana-db2_11_1 
+    docker stop taskana-db2_11_1
+    ECHO ---
+    GOTO MENU
+
+:START_POSTGRES_10_4
+    ECHO ---
+    docker ps -aq -f name=^/taskana-postgres_10_4$ -f status=running > %TEMP%\temp
+    SET /P CONTAINER_RUNNING=< %TEMP%\temp
+    docker ps -aq -f name=^/taskana-postgres_10_4$ > %TEMP%\temp
+    SET /P CONTAINER_EXISTS=< %TEMP%\temp
+    del %TEMP%\temp
+
+    IF NOT DEFINED CONAINER_RUNNING IF DEFINED CONTAINER_EXISTS (
+        ECHO docker start taskana-postgres_10_4
+        docker start taskana-postgres_10_4
+    )
+
+    IF NOT DEFINED CONAINER_RUNNING IF NOT DEFINED CONTAINER_EXISTS (
+        ECHO docker run -d -p 50102:5432 --name taskana-postgres_10_4 -e POSTGRES_PASSWORD=postgres postgres:10.4
+        docker run -d -p 50102:5432 --name taskana-postgres_10_4 -e POSTGRES_PASSWORD=postgres postgres:10.4
+    )
+
+    ECHO jdbcDriver=org.postgresql.Driver > %PROP_FILE%
+    ECHO jdbcUrl=jdbc:postgresql://localhost:50001/postgres >> %PROP_FILE%
+    ECHO dbUserName=postgres >> %PROP_FILE%
+    ECHO dbPassword=postgres >> %PROP_FILE%
+    ECHO schemaName=taskana >> %PROP_FILE%
+    ECHO ---
+    GOTO MENU
+
+:STOP_POSTGRES_10_4
+    ECHO ---
+    ECHO docker stop taskana-postgres_10_4 
+    docker stop taskana-postgres_10_4
+    ECHO ---
+    GOTO MENU
+
+:STOP_ALL
+    ECHO ---
+    ECHO docker stop taskana-db2_10_5
+    docker stop taskana-db2_10_5
+    ECHO docker stop taskana-db2_11_1
+    docker stop taskana-db2_11_1
+    ECHO docker stop taskana-postgres_10_4
+    docker stop takana-postgres_10_4
+    ECHO ---
+    GOTO MENU
+
+:REMOVE_PROP
+    ECHO ---
+    IF EXIST %PROP_FILE% (
+        ECHO DEL /F %PROP_FILE%
+        DEL /F %PROP_FILE%
+    )
+    ECHO ---
+    GOTO MENU
diff --git a/ci/prepare_db.sh b/ci/prepare_db.sh
index 58fec3ee0..b6f378b65 100755
--- a/ci/prepare_db.sh
+++ b/ci/prepare_db.sh
@@ -14,7 +14,7 @@ set -e #fail fast
 #H   - H2
 #H   - DB2_10_5
 #H   - DB2_11_1
-#H   - POSTGRES
+#H   - POSTGRES_10_4
 # Arguments:
 #   $1: exit code
 function helpAndExit {
@@ -28,17 +28,20 @@ function main {
    
   case "$1" in 
     H2)
+      if [[ -f "$propFile" ]]; then
+        rm "$propFile"
+      fi
       ;;
     DB2_10_5)
       if [[ -z `docker ps -aq -f name=^/taskana-db2_10_5$ -f status=running` ]]; then
         if [[ -z `docker ps -aq -f name=^/taskana-db2_10_5$` ]]; then
-          docker run -d -p 49999:50000 --name taskana-db2_10_5 mustaphazorgati/db2:10.5 -d
+          docker run -d -p 50100:50000 --name taskana-db2_10_5 taskana/db2:10.5 -d
         else
           docker start taskana-db2_10_5
         fi
       fi
       echo 'jdbcDriver=com.ibm.db2.jcc.DB2Driver' > $propFile
-      echo 'jdbcUrl=jdbc:db2://localhost:49999/tskdb' >> $propFile
+      echo 'jdbcUrl=jdbc:db2://localhost:50100/tskdb' >> $propFile
       echo 'dbUserName=db2inst1' >> $propFile
       echo 'dbPassword=db2inst1-pwd' >> $propFile
       echo 'schemaName=TASKANA' >> $propFile
@@ -46,27 +49,27 @@ function main {
     DB2_11_1)
       if [[ -z `docker ps -aq -f name=^/taskana-db2_11_1$ -f status=running` ]]; then
         if [[ -z `docker ps -aq -f name=^/taskana-db2_11_1$` ]]; then
-          docker run -d -p 50000:50000 --name taskana-db2_11_1 mustaphazorgati/db2:11.1 -d
+          docker run -d -p 50101:50000 --name taskana-db2_11_1 taskana/db2:11.1 -d
         else
           docker start taskana-db2_11_1
         fi
       fi
       echo 'jdbcDriver=com.ibm.db2.jcc.DB2Driver' > $propFile
-      echo 'jdbcUrl=jdbc:db2://localhost:50000/tskdb' >> $propFile
+      echo 'jdbcUrl=jdbc:db2://localhost:50101/tskdb' >> $propFile
       echo 'dbUserName=db2inst1' >> $propFile
       echo 'dbPassword=db2inst1-pwd' >> $propFile
       echo 'schemaName=TASKANA' >> $propFile
       ;;
-    POSTGRES)
-      if [[ -z `docker ps -aq -f name=^/taskana-postgres$ -f status=running` ]]; then
-        if [[ -z `docker ps -aq -f name=^/taskana-postgres$` ]]; then
-          docker run -d -p 50001:5432 --name taskana-postgres -e POSTGRES_PASSWORD=postgres postgres:10.4
+    POSTGRES_10_4)
+      if [[ -z `docker ps -aq -f name=^/taskana-postgres_10_4$ -f status=running` ]]; then
+        if [[ -z `docker ps -aq -f name=^/taskana-postgres_10_4$` ]]; then
+          docker run -d -p 50102:5432 --name taskana-postgres_10_4 -e POSTGRES_PASSWORD=postgres postgres:10.4
         else
-          docker start taskana-postgres
+          docker start taskana-postgres_10_4
         fi
       fi
       echo 'jdbcDriver=org.postgresql.Driver' > $propFile
-      echo 'jdbcUrl=jdbc:postgresql://localhost:50001/postgres' >> $propFile
+      echo 'jdbcUrl=jdbc:postgresql://localhost:50102/postgres' >> $propFile
       echo 'dbUserName=postgres' >> $propFile   
       echo 'dbPassword=postgres' >> $propFile
       echo 'schemaName=taskana' >> $propFile
diff --git a/ci/test.sh b/ci/test.sh
index 3c6d19082..a74ebf5b0 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -14,6 +14,7 @@ set -e # fail fast
 #H   - H2
 #H   - DB2_10_5
 #H   - DB2_11_1
+#H   - POSTGRES_10_4
 # Arguments:
 #   $1: exit code
 function helpAndExit {