diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b3a47d7c..746d1db75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:client-20160621
+image: mvdan/fdroid-ci:client-20160706
 
 cache:
   paths:
diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle
index cfe3d1269..247ac29ef 100644
--- a/Privileged-Extension/build.gradle
+++ b/Privileged-Extension/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '24'
+    buildToolsVersion '23.0.3'
 
     defaultConfig {
         minSdkVersion 8
diff --git a/app/build.gradle b/app/build.gradle
index 6d92b39a1..e4cf7c499 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -140,7 +140,7 @@ if (!hasProperty('sourceDeps')) {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '24'
+    buildToolsVersion '23.0.3'
     useLibrary 'org.apache.http.legacy'
 
     buildTypes {
diff --git a/privileged-api-lib/build.gradle b/privileged-api-lib/build.gradle
index 8ff047977..ef9bd8b99 100644
--- a/privileged-api-lib/build.gradle
+++ b/privileged-api-lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '24'
+    buildToolsVersion '23.0.3'
 
     defaultConfig {
         minSdkVersion 8