diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5344ba01d..13425630a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: fdroid/ci:client-20160927
+image: fdroid/ci:client-20161023
 
 cache:
   paths:
diff --git a/app/build.gradle b/app/build.gradle
index c4a97632e..302fef2f3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -146,7 +146,7 @@ if (!hasProperty('sourceDeps')) {
 
 android {
     compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    buildToolsVersion '25.0.0'
     useLibrary 'org.apache.http.legacy'
 
     buildTypes {
diff --git a/extern/support-v4-preferencefragment/build.gradle b/extern/support-v4-preferencefragment/build.gradle
index d675ee7ef..7e6b0546a 100644
--- a/extern/support-v4-preferencefragment/build.gradle
+++ b/extern/support-v4-preferencefragment/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '24.0.2'
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         minSdkVersion 7