diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a78deb73..4d4a92bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -371,8 +371,11 @@ safety:
         python3-biplist
         python3-pip
         python3-pycountry
+        python3-venv
     - $pip install --break-system-packages .
 
+    - python3 -m venv --system-site-packages env
+    - . env/bin/activate
     - $pip install --break-system-packages safety
     - python3 -m safety --key "$SAFETY_API_KEY" --stage cicd scan
 
@@ -609,13 +612,12 @@ plugin_fetchsrclibs:
         python3-pil
         python3-pip
         python3-pycparser
+        python3-setuptools
         python3-venv
     - python3 -m venv --system-site-packages env
     - . env/bin/activate
     - export PATH="$CI_PROJECT_DIR:$PATH"
     - export PYTHONPATH="$CI_PROJECT_DIR/examples"
-    # workaround https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003252
-    - export SETUPTOOLS_USE_DISTUTILS=stdlib
     - $pip install -e .
     - fdroid | grep fetchsrclibs
 
@@ -660,7 +662,6 @@ servergitmirrors:
     - python3 -m venv --system-site-packages env
     - . env/bin/activate
     - export PYTHONPATH=`pwd`
-    - export SETUPTOOLS_USE_DISTUTILS=stdlib  # https://github.com/pypa/setuptools/issues/2956
     - $pip install -e .
     - mkdir /root/.ssh/
     - ./tests/key-tricks.py
diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index d17d187c..57718bb5 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -632,6 +632,7 @@ def checkupdates_app(app: metadata.App, auto: bool, make_commit: bool = False) -
                     'apt-get install -y -t trixie openjdk-21-jdk-headless',
                     'apt-get install -y -t trixie openjdk-22-jdk-headless',
                     'apt-get install -y -t trixie openjdk-23-jdk-headless',
+                    'apt-get install -y -t trixie openjdk-25-jdk-headless',
                     'echo "deb http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list',
                     'echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list',
                     'update-alternatives --auto java',