diff --git a/.travis.yml b/.travis.yml
index 4be3b915..7990f47b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,9 +28,6 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis_wait 30 $GOPATH/src/github.com/therecipe/qt/internal/ci/linux.sh; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 45 $GOPATH/src/github.com/therecipe/qt/internal/ci/darwin.sh; fi
 
-before_script:
-  - sudo chown $USER /usr/local/bin
-
 script:
   - if [[ "$DESKTOP" == "true" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh; else go run $GOPATH/src/github.com/therecipe/qt/internal/setup/generate.go; fi
   - if [[ "$ANDROID" == "true" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh android; fi
diff --git a/appveyor.yml b/appveyor.yml
old mode 100644
new mode 100755
index a0513717..2b208d10
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,16 +1,16 @@
 version: 1.0.{build}
 clone_depth: 1
 clone_folder: C:\work\src\github.com\therecipe\qt
-environment:
-  GOPATH: C:\work
 install:
 - cmd: >-
     set PATH=%PATH%;C:\Qt\Qt5.7.0\Tools\mingw530_32\bin
 
+    set GOPATH=C:\work
+
 
     set QT=qt-opensource-windows-x86-android-5.7.0.exe
 
-    curl -sL --retry 6 --retry-delay 20 -o %TMP%\%QT% https://download.qt.io/official_releases/qt/5.7/5.7.0/%QT%
+    curl -sL --retry 10 --retry-delay 10 -o %TMP%\%QT% https://download.qt.io/official_releases/qt/5.7/5.7.0/%QT%
 
     %TMP%\%QT% --script %GOPATH%\src\github.com\therecipe\qt\internal\ci\iscript.qs
 
@@ -19,19 +19,19 @@ install:
 
     set SDK=android-sdk_r24.4.1-windows.zip
 
-    curl -sL --retry 6 --retry-delay 20 -o %TMP%\%SDK% https://dl.google.com/android/%SDK%
+    curl -sL --retry 10 --retry-delay 10 -o %TMP%\%SDK% https://dl.google.com/android/%SDK%
 
     7z x %TMP%\%SDK% -oC:\
 
     DEL %TMP%\%SDK% /Q
 
 
-    echo y | %ANDROID_SDK_DIR%\tools\android.bat -s update sdk -f -u -a -t 1,2,4,31
+    echo y | C:\android-sdk-windows\tools\android.bat -s update sdk -f -u -a -t 1,2,4,31
 
 
-    SET NDK=android-ndk-r12b-windows-x86_64.zip
+    set NDK=android-ndk-r12b-windows-x86_64.zip
 
-    curl -sL --retry 6 --retry-delay 20 -o %TMP%\%NDK% https://dl.google.com/android/repository/%NDK%
+    curl -sL --retry 10 --retry-delay 10 -o %TMP%\%NDK% https://dl.google.com/android/repository/%NDK%
 
     7z x %TMP%\%NDK% -oC:\
 
diff --git a/circle.yml b/circle.yml
index 13712b7a..e0838e0c 100755
--- a/circle.yml
+++ b/circle.yml
@@ -1,15 +1,13 @@
 machine:
-  environment:
-    OS: linux
-    CI: true
-    DESKTOP: true
-    ANDROID: true
-
 checkout:
 dependencies:
-  - if [[ "$OS" == "linux" ]]; then $GOPATH/src/github.com/therecipe/qt/internal/ci/linux.sh; fi
 database:
 test:
+  - export OS=linux
+  - export CI=true
+  - export DESKTOP=true
+  - export ANDROID=true
+  - if [[ "$OS" == "linux" ]]; then $GOPATH/src/github.com/therecipe/qt/internal/ci/linux.sh; fi
   - if [[ "$DESKTOP" == "true" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh; else go run $GOPATH/src/github.com/therecipe/qt/internal/setup/generate.go; fi
   - if [[ "$ANDROID" == "true" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh android; fi
 deployment:
diff --git a/internal/ci/darwin.sh b/internal/ci/darwin.sh
index 0c3d92b6..8c4dcf9d 100755
--- a/internal/ci/darwin.sh
+++ b/internal/ci/darwin.sh
@@ -15,7 +15,7 @@ QT=qt-opensource-mac-x64-android-ios-5.7.0
 else
 QT=qt-opensource-mac-x64-android-5.7.0
 fi
-curl -sL --retry 6 --retry-delay 20 -o /tmp/$QT.dmg https://download.qt.io/official_releases/qt/5.7/5.7.0/$QT.dmg
+curl -sL --retry 10 --retry-delay 10 -o /tmp/$QT.dmg https://download.qt.io/official_releases/qt/5.7/5.7.0/$QT.dmg
 hdiutil attach -noverify -noautofsck -quiet /tmp/$QT.dmg
 /Volumes/$QT/$QT.app/Contents/MacOS/$QT --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs
 diskutil unmountDisk disk1
@@ -25,7 +25,7 @@ if [ "$ANDROID" == "true" ]
 then
 #download and install android sdk
 SDK=android-sdk_r24.4.1-macosx.zip
-curl -sL --retry 6 --retry-delay 20 -o /tmp/$SDK https://dl.google.com/android/$SDK
+curl -sL --retry 10 --retry-delay 10 -o /tmp/$SDK https://dl.google.com/android/$SDK
 unzip -qq /tmp/$SDK -d $HOME
 rm -f /tmp/$SDK
 
@@ -34,7 +34,7 @@ echo "y" | $HOME/android-sdk-macosx/tools/android -s update sdk -f -u -a -t 1,2,
 
 #download and install android ndk
 NDK=android-ndk-r12b-darwin-x86_64.zip
-curl -sL --retry 6 --retry-delay 20 -o /tmp/$NDK https://dl.google.com/android/repository/$NDK
+curl -sL --retry 10 --retry-delay 10 -o /tmp/$NDK https://dl.google.com/android/repository/$NDK
 unzip -qq /tmp/$NDK -d $HOME
 rm -f /tmp/$NDK
 fi
diff --git a/internal/ci/linux.sh b/internal/ci/linux.sh
index ff82a8fd..4466d369 100755
--- a/internal/ci/linux.sh
+++ b/internal/ci/linux.sh
@@ -19,14 +19,14 @@ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90
 
 #download and install qt
 QT=qt-opensource-linux-x64-android-5.7.0.run
-curl -sL --retry 6 --retry-delay 20 -o /tmp/$QT https://download.qt.io/official_releases/qt/5.7/5.7.0/$QT
+curl -sL --retry 10 --retry-delay 10 -o /tmp/$QT https://download.qt.io/official_releases/qt/5.7/5.7.0/$QT
 chmod +x /tmp/$QT
 /tmp/$QT --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs
 rm -f /tmp/$QT
 
 #download and install android sdk
 SDK=android-sdk_r24.4.1-linux.tgz
-curl -sL --retry 6 --retry-delay 20 -o /tmp/$SDK https://dl.google.com/android/$SDK
+curl -sL --retry 10 --retry-delay 10 -o /tmp/$SDK https://dl.google.com/android/$SDK
 tar -xzf /tmp/$SDK -C $HOME
 rm -f /tmp/$SDK
 
@@ -35,10 +35,13 @@ echo "y" | $HOME/android-sdk-linux/tools/android -s update sdk -f -u -a -t 1,2,4
 
 #download and install android ndk
 NDK=android-ndk-r12b-linux-x86_64.zip
-curl -sL --retry 6 --retry-delay 20 -o /tmp/$NDK https://dl.google.com/android/repository/$NDK
+curl -sL --retry 10 --retry-delay 10 -o /tmp/$NDK https://dl.google.com/android/repository/$NDK
 unzip -qq /tmp/$NDK -d $HOME
 rm -f /tmp/$NDK
 
+#prepare env
+sudo chown $USER /usr/local/bin
+
 #check env
 df -h
 
diff --git a/internal/deploy/deploy.go b/internal/deploy/deploy.go
index baa28100..e0b54fa2 100755
--- a/internal/deploy/deploy.go
+++ b/internal/deploy/deploy.go
@@ -96,6 +96,10 @@ func args() {
 		}
 	}
 
+	if strings.ToLower(os.Getenv("CI")) == "true" {
+		buildMode = "build"
+	}
+
 	buildMinimal = true
 
 	switch buildMode {