diff --git a/Dockerfile b/Dockerfile
index b18a19098c5c7005eb7f2d6a43c62ac546cce62f..f820eb8eac30405e4245c7dc799154a90890be4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 MAINTAINER Jan Grewe <jan@faked.org>
 
 ENV VERSION_TOOLS "8512546"
@@ -15,10 +15,10 @@ RUN apt-get -qq update \
       curl \
       git-core \
       html2text \
-      openjdk-11-jdk \
+      openjdk-17-jdk \
       libc6-i386 \
       lib32stdc++6 \
-      lib32gcc1 \
+      lib32gcc-s1 \
       lib32ncurses6 \
       lib32z1 \
       unzip \
diff --git a/packages.txt b/packages.txt
index 2563e3ea883bfe8e466ad3f0b2c607d98968945c..8bef9ee7cd718d6006975ecfb9a4fb37af2b648f 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,7 +1,7 @@
 add-ons;addon-google_apis-google-24
-build-tools;33.0.0
+build-tools;34.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-33
+platforms;android-34