diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86e8a50..9e685d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,20 +3,23 @@ image: openjdk:8-jdk
 variables:
   ANDROID_COMPILE_SDK: "25"
   ANDROID_BUILD_TOOLS: "24.0.3"
-  ANDROID_SDK_TOOLS: "25.2.4"
+  ANDROID_SDK_TOOLS: "25.2.3"
 
 before_script:
-  - wget --quiet --output-document=android-sdk.tgz https://dl.google.com/android/android-sdk_r${ANDROID_SDK_TOOLS}-linux.tgz
-  - tar --extract --gzip --file=android-sdk.tgz
-  - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK}
-  - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter platform-tools
-  - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter build-tools-${ANDROID_BUILD_TOOLS}
-  - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository
-  - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services
-  - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
-  - chmod +x ./gradlew
+  - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/tools_r${ANDROID_SDK_TOOLS}-linux.zip
+  - mkdir -p sdk
+  - cd sdk
+  - unzip -o -qq ../android-sdk.zip
+  - echo y | tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK}
+  - echo y | tools/android --silent update sdk --no-ui --all --filter platform-tools
+  - echo y | tools/android --silent update sdk --no-ui --all --filter build-tools-${ANDROID_BUILD_TOOLS}
+  - echo y | tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository
+  - echo y | tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services
+  - echo y | tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository
+  - cd ..
+  - export ANDROID_HOME=$PWD/sdk
+  - export PATH=$PATH:$PWD/sdk/platform-tools/
+  - gradle wrapper
 
 stages:
   - build