diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 9e511096..67079769 100644
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -3,7 +3,7 @@ ndk_paths = {
     'r9b': "/home/vagrant/android-ndk/r9b",
     'r10d': "/home/vagrant/android-ndk/r10d"
 }
-build_tools = "21.1.2"
+build_tools = "22.0.0"
 ant = "ant"
 mvn3 = "mvn"
 gradle = "gradle"
diff --git a/examples/config.py b/examples/config.py
index 31b44ab6..4ad5a323 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -15,7 +15,7 @@ ndk_paths = {
 }
 
 # Build tools version to be used
-build_tools = "21.1.2"
+build_tools = "22.0.0"
 
 # Command or path to binary for running Ant
 ant = "ant"
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index dc8162e1..38eed060 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -47,7 +47,7 @@ default_config = {
         'r9b': None,
         'r10d': "$ANDROID_NDK"
     },
-    'build_tools': "21.1.2",
+    'build_tools': "22.0.0",
     'ant': "ant",
     'mvn3': "mvn",
     'gradle': 'gradle',