diff --git a/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml
index 5bef5c55971..e0d33166834 100644
--- a/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml
+++ b/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml
@@ -50,7 +50,7 @@ on:
         required: true
   
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
   RUBY_VERSION: 3.2.0
     
 jobs:
diff --git a/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
index 566dd1869a4..3324cd2d9cf 100644
--- a/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
+++ b/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
@@ -34,7 +34,7 @@ on:
         required: true
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
   RUBY_VERSION: 3.2.0
  
 jobs:
diff --git a/.github/workflows/postsubmit.yml b/.github/workflows/postsubmit.yml
index fed9ccddf9b..6351b6c0ac4 100644
--- a/.github/workflows/postsubmit.yml
+++ b/.github/workflows/postsubmit.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v4.5.0
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       # Get the flutter version from ./flutter-version.txt
       - run: echo "FLUTTER_VERSION=$(cat flutter-version.txt)" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/waldo_sessions.yml b/.github/workflows/waldo_sessions.yml
index 81eb0d98e1d..07e4627272b 100644
--- a/.github/workflows/waldo_sessions.yml
+++ b/.github/workflows/waldo_sessions.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-java@v4.5.0
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       # Get the flutter version from ./flutter-version.txt
       - run: echo "FLUTTER_VERSION=$(cat flutter-version.txt)" >> $GITHUB_OUTPUT