diff --git a/Dockerfile b/Dockerfile
index 0676d4ea22c6af3627ba934b2f425c673659036a..ef8e00db20711ff90c1cd20009a0c83d224992ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Romain Hunault <romain.hunault@e.email>
 
 # Environment variables
@@ -185,29 +185,19 @@ RUN mkdir -p $USERSCRIPTS_DIR
 RUN apt-get -qq update
 RUN apt-get -qqy upgrade
 
-RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \
-      curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick img2simg kmod jq \
-      lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \
-      libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \
-      libxml2-utils lsof lzop maven openjdk-8-jdk pngcrush \
-      procps python python3 rsync schedtool simg2img squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \
+RUN apt-get install -y android-sdk-libsparse-utils bc bison bsdmainutils build-essential ccache cgpt clang cron \
+      curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick kmod jq \
+      lib32readline-dev lib32z1-dev liblz4-tool \
+      libsdl1.2-dev libssl-dev libxml2 \
+      libxml2-utils lsof lzop maven pngcrush \
+      procps python3 python-is-python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \
       zip zlib1g-dev
 
 RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo
 RUN chmod a+x /usr/local/bin/repo
-RUN ln -fs /usr/bin/python3 /usr/bin/python
-
-# Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster
-RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
-RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb
-RUN apt-get -qq update && apt-get install -y temurin-8-jdk
-RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java
-
-
-# Fix jack server SSL issue during build for openjdk (adoptopenjdk won't work for nougat and oreo)
-RUN perl -0777 -i -p -e 's/(jdk.tls.disabledAlgorithms=.*?), TLSv1, TLSv1\.1/$1/g' \
-      /etc/java-8-openjdk/security/java.security
 
+RUN wget https://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libtinfo5_6.3-2_amd64.deb && dpkg -i libtinfo5_6.3-2_amd64.deb && rm -f libtinfo5_6.3-2_amd64.deb
+RUN wget https://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libncurses5_6.3-2_amd64.deb && dpkg -i libncurses5_6.3-2_amd64.deb && rm -f libncurses5_6.3-2_amd64.deb
 
 # Set the work directory
 ########################
diff --git a/Dockerfile.community b/Dockerfile.community
index 87bbd640335be6e4cb116348da7f1d22ba7724e9..6cee5eb912a10586d9a92452daa7e3661555741b 100644
--- a/Dockerfile.community
+++ b/Dockerfile.community
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Romain Hunault <romain.hunault@e.email>
 
 # Environment variables
@@ -177,23 +177,19 @@ RUN mkdir -p $USERSCRIPTS_DIR
 RUN apt-get -qq update
 RUN apt-get -qqy upgrade
 
-RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \
+RUN apt-get install -y android-sdk-libsparse-utils bc bison bsdmainutils build-essential ccache cgpt clang cron \
       curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick kmod jq \
-      lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \
-      libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \
+      lib32readline-dev lib32z1-dev liblz4-tool \
+      libsdl1.2-dev libssl-dev libxml2 \
       libxml2-utils lsof lzop maven pngcrush \
-      procps python python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \
+      procps python3 python-is-python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \
       zip zlib1g-dev
 
 RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo
 RUN chmod a+x /usr/local/bin/repo
-RUN ln -fs /usr/bin/python3 /usr/bin/python
 
-# Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster
-RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
-RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb
-RUN apt-get -qq update && apt-get install -y temurin-8-jdk
-RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java
+RUN wget https://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libtinfo5_6.3-2_amd64.deb && dpkg -i libtinfo5_6.3-2_amd64.deb && rm -f libtinfo5_6.3-2_amd64.deb
+RUN wget https://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libncurses5_6.3-2_amd64.deb && dpkg -i libncurses5_6.3-2_amd64.deb && rm -f libncurses5_6.3-2_amd64.deb
 
 # Set the work directory
 ########################