diff --git a/Dockerfile b/Dockerfile
index 68aba77c31b33288d32d27f296106005100339f0..f4117fbcd14b79dfdaa3d4632837fc94e4064095 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 MAINTAINER Jan Grewe <jan@faked.org>
 
-ENV VERSION_TOOLS "6858069"
+ENV VERSION_TOOLS "7583922"
 
 ENV ANDROID_SDK_ROOT "/sdk"
 # Keep alias for compatibility
diff --git a/packages.txt b/packages.txt
index 82af47ccfc7d55d671551795dd94a67f41d92ecd..4e10805037a4aa6320bb84bc4588cd616a01af8d 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,7 +1,7 @@
 add-ons;addon-google_apis-google-24
-build-tools;30.0.3
+build-tools;31.0.0
 extras;android;m2repository
 extras;google;m2repository
 extras;google;google_play_services
 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2
-platforms;android-30
+platforms;android-31