diff --git a/docker-gitlabci/Dockerfile b/docker-gitlabci/Dockerfile
index 84ddcfe..ef19e35 100644
--- a/docker-gitlabci/Dockerfile
+++ b/docker-gitlabci/Dockerfile
@@ -7,7 +7,8 @@ RUN useradd -d /nonexistent -g nogroup -s /bin/false domjudge-run-0
 RUN useradd -d /nonexistent -g nogroup -s /bin/false domjudge-run-1
 RUN groupadd domjudge-run
 
-RUN apt-get update && apt-get install -y \
+RUN apt-add-repository ppa:pypy/ppa -y \
+  apt-get update && apt-get -y install \
   acl make zip unzip apache2-utils bsdmainutils libcurl4-gnutls-dev \
   libjsoncpp-dev libmagic-dev autoconf automake bats sudo debootstrap procps \
   gcc g++ default-jre-headless default-jdk-headless ghc fp-compiler libcgroup-dev \
diff --git a/docker/judgehost/Dockerfile.chroot b/docker/judgehost/Dockerfile.chroot
index 89e9ade..8ea6e57 100644
--- a/docker/judgehost/Dockerfile.chroot
+++ b/docker/judgehost/Dockerfile.chroot
@@ -1,6 +1,7 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get -y install \
+RUN apt-add-repository ppa:pypy/ppa -y \
+  apt-get update && apt-get -y install \
   ca-certificates default-jre-headless pypy3 locales \
   && rm -rf /var/lib/apt/lists/*