diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd4bdaf3e..92c1c4fd8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,12 +17,14 @@ workflow:
 .base:
   tags:
     - saas-linux-xlarge-amd64
+  variables:
+    JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
   before_script:
     - echo "org.gradle.caching=true" >> gradle.properties
     - test -e /etc/apt/sources.list.d/bullseye-backports.list
         || echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
     - apt update
-    - apt-get -qy install -t bullseye-backports --no-install-recommends git sdkmanager
+    - apt-get -qy install -t bullseye-backports --no-install-recommends git sdkmanager openjdk-17-jdk-headless
 
     - test -n "$ANDROID_HOME" || source /etc/profile.d/bsenv.sh
 
@@ -202,9 +204,11 @@ libs database schema:
     - <<: *always-on-these-changes
     - changes:
         - libs/database/**/*
+  variables:
+    JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
   script:
     - apt-get update
-    - apt-get -qy --no-install-recommends install default-jdk-headless git sdkmanager
+    - apt-get -qy --no-install-recommends install openjdk-17-jdk-headless git sdkmanager
     - export ANDROID_HOME=/opt/android-sdk
     - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdk\s*\([0-9][0-9]*\).*,\1,p' app/build.gradle`
     - sdkmanager "platforms;android-$ANDROID_COMPILE_SDK" "build-tools;30.0.3"
@@ -319,9 +323,11 @@ deploy_nightly:
   stage: deploy
   only:
     - master
+  variables:
+    JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
   script:
     - test -z "$DEBUG_KEYSTORE" && exit 0
-    - apt-get install -t bullseye-backports fdroidserver
+    - apt-get install -t bullseye-backports openjdk-17-jdk-headless fdroidserver
     - sed -i
         's,<string name="app_name">.*</string>,<string name="app_name">F-Nightly</string>,'
         app/src/main/res/values*/strings.xml