diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46370730..7d2cfcaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ before_script:
 
     - apt-get update || apt-get update
     - apt-get install -y openjdk-17-jdk-headless
-    - update-alternatives --auto java
+    - update-java-alternatives -s java-1.17.0-openjdk-amd64
   after_script:
     # this file changes every time but should not be cached
     - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
@@ -77,9 +77,7 @@ debugTests:
   image: briar/ci-image-android-emulator:latest
   stage: test
   script:
-    - apt-get update || apt-get update
-    - apt-get install -y openjdk-17-jdk-headless
-    - update-alternatives --auto java
+    - export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
     - ./gradlew assembleStaging
     - export AVD_SDK=`echo $CI_JOB_NAME | awk '{print $2}'`
     - export AVD_TAG=`echo $CI_JOB_NAME | awk '{print $3}'`
diff --git a/app/build.gradle b/app/build.gradle
index 6113e9d3..283ae9a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 21
+        versionCode 22
         versionName "1.0.beta" + versionCode
 
         //TODO add resConfigs("en", "fr", "ja",...) ?