diff --git a/Dockerfile b/Dockerfile
index 1f23e47dc4ea9cbb4a56bb6c9c35c6447aedf1a4..00101cfcf6fae99077605c09407bfa183e7efc82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,7 @@
-#
-# GitLab CI: Android v0.3
-#
-# https://hub.docker.com/r/jangrewe/gitlab-ci-android/
-# https://git.faked.org/jan/gitlab-ci-android
-#
-
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER Jan Grewe <jan@faked.org>
 
-ENV VERSION_TOOLS "6200805"
+ENV VERSION_TOOLS "6609375"
 
 ENV ANDROID_SDK_ROOT "/sdk"
 # Keep alias for compatibility
@@ -26,7 +19,7 @@ RUN apt-get -qq update \
       libc6-i386 \
       lib32stdc++6 \
       lib32gcc1 \
-      lib32ncurses5 \
+      lib32ncurses6 \
       lib32z1 \
       unzip \
       locales \
diff --git a/packages.txt b/packages.txt
index 2c98487c4127b66bc33b0fbeb1ab551ae0c11242..6567ef89ba465c1e880da2e387240a27848215c7 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,5 +1,5 @@
 add-ons;addon-google_apis-google-24
-build-tools;30.0.0
+build-tools;30.0.2
 extras;android;m2repository
 extras;google;m2repository
 extras;google;google_play_services