diff --git a/.travis.yml b/.travis.yml
index 8998af4..b4b4efe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,13 +13,11 @@ addons:
     
 before_install:
   - export TRAVIS_TAG=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
-  - echo $TRAVIS_TAG  
+  - mkdir $TRAVIS_BUILD_DIR/dist && chmod a+w $TRAVIS_BUILD_DIR/dist
   - docker build -t android-dispatch .
-  - docker run -it -d --user build --name dispatch-container -v `pwd`:/home/build/app -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash
+  - docker run -it -d --user build --name dispatch-container -v $TRAVIS_BUILD_DIR/dist:/home/build/app/dist -e TRAVIS_TAG=$TRAVIS_TAG android-dispatch bash
 
 script:
-  - docker exec --user build dispatch-container sh ls -al /home/build/app
-  - docker exec --user build dispatch-container sh whoami
   - docker exec --user build dispatch-container sh /home/build/app/dispatch.sh
   - docker exec --user build dispatch-container sh /home/build/app/package.sh
 
@@ -33,7 +31,7 @@ deploy:
     secure: "YaRLBvXCW3V+HEuk6n/gJlXOMXEGLGYvNFaKawboLcTJEOtvn0ur72hzXHJRYWC2JGNgPdLxl8f9AHGt3pgU5JpCgDm/zxpUx6lrKAKwnSD+WKNeE9n0HIKhzskd5tsaFPWN0njkoZocUAyNuuePslYj+QCUvlV0U1B1xGKICkxYSyRD2rBKSan7XpMW0PP45O2EhSkcnodx2nJjZqSuP3ErF5OLt2qfEORzVX/KmohmAJUZnefsg+v50Y76746QEmPDuhfAXa/ETGPkZt31a0AqlOcLAdgFmhX9RC3Piv7jRjb81kE4uRlkRg7acMvQmqtFeT6NoFP4bBLKIepNDCqNvaSEd9NLwiygXHeu3j3qhxSk3a8jZmiIt+DUENDKTiRwj4+GMFwmW7rgKZ2ZVo6btTfyv0cy3cCtfsheZurnclH2OFRsdxc1Ps+gnjfX4vZhtbAkG0ROBtuhfe3TnyJEXkzHeVhmYCmsbhc7MF7oy7cvWLsyszGuwGI31wYVqSCuxQcob4rMSN1wCSuA9PrDmFoa7VYeMmJlvJdy7J1qcNlZpE/kGzJJW5MezMO/YyCS/VxNudq29xqUkQ3RFc2QemNMtqLeb63F6WeIbrG7UTSPO8vubUklwCTEt1glf2o6nx4hGOYyFkotx+NXchlh4Pt8Vf0IX529APmNw4o="
   file_glob: true
   tag_name: $TRAVIS_TAG
-  file: $TRAVIS_BUILD_DIR/libs/*.zip
+  file: $TRAVIS_BUILD_DIR/dist/*.zip
   name: Release-$TRAVIS_TAG
   skip_cleanup: true
   on:
diff --git a/Dockerfile b/Dockerfile
index 116fed9..cc05860 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,4 +67,6 @@ RUN useradd build -m -u 112
 USER build
 
 RUN mkdir -p /home/build/.m2 && mkdir -p /home/build/app
-WORKDIR /home/build/app
+COPY . /home/build/app/
+
+WORKDIR /home/build/app/
diff --git a/dispatch.sh b/dispatch.sh
index a26ae78..c1c9840 100755
--- a/dispatch.sh
+++ b/dispatch.sh
@@ -91,7 +91,7 @@ build_android() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SYSTEM_NAME=Android \
     -DCMAKE_SYSROOT=${TOOLCHAIN_ROOT_PATH}/sysroot \
-    -DBUILD_SHARED_LIBS=YES \
+    -DBUILD_SHARED_LIBS=NO \
     -DENABLE_TESTING=OFF \
     -DCMAKE_ANDROID_ARCH_ABI=${ABI} \
     -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang \
@@ -121,10 +121,10 @@ build_linux() {
     -DCMAKE_CXX_COMPILER=clang++ \
     -DBUILD_SHARED_LIBS=YES \
     -DENABLE_TESTING=OFF \
+    -DCMAKE_SYSTEM_NAME=Linux \
     -DCMAKE_INSTALL_PREFIX=${LIBS}/linux
     
     ninja
-    
     cmake -P cmake_install.cmake
 }
 
diff --git a/package.sh b/package.sh
index f687dc6..35fca56 100644
--- a/package.sh
+++ b/package.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/bash
 
 LIBS_HOME=/home/build/app/libs
+TARGET_DIR=/home/build/app/dist
 
 if [ ! -d "${LIBS_HOME}" ]; then
     echo "Missing library folder"    
@@ -9,8 +10,8 @@ fi
 
 cd ${LIBS_HOME}/android
 zip -r dispatch-${TRAVIS_TAG}-android.zip .
-mv *.zip ${LIBS_HOME}
+mv *.zip ${TARGET_DIR}
 
 cd ${LIBS_HOME}/linux
 zip -r dispatch-${TRAVIS_TAG}-linux.zip .
-mv *.zip ${LIBS_HOME}
+mv *.zip ${TARGET_DIR}
diff --git a/pom.xml b/pom.xml
index 63b12b0..77e5ec2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.letsdev.intern</groupId>
     <artifactId>lib-dispatch</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.1</version>
     <name>Apple dispatch library for android and linux</name>
     <!-- organization -->
     <organization>