diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be84a3a3a2..bf2c53ccbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -364,7 +364,7 @@ fdroid build:
   needs: []
   # Some env vars are setup in https://gitlab.com/fdroid/fdroidserver/-/blob/master/buildserver/setup-env-vars
   # home_vagrant=/home/vagrant
-  image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bullseye
+  image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bookworm
   tags:
     - saas-linux-medium-amd64
   artifacts:
@@ -452,8 +452,8 @@ fdroid build:
           popd;
           rm -rf $home_vagrant/build || true;
           rm -rf $ANDROID_HOME/ndk || true;
-          apt-get install -y openjdk-11-jdk-headless;
-          update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java;
+          apt-get install -y openjdk-17-jdk-headless;
+          update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java;
           ./tools/build-contains-signatures.py $build || continue;
           apt-get install sudo;
           $fdroid publish --verbose $build;
@@ -474,7 +474,7 @@ fdroid build:
 # to GitLab Pages.
 pages:
   stage: deploy
-  image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bullseye
+  image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bookworm
   only:
     refs:
       - branches