diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index aac84fdc5cb7..e7bd9015000b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -32,13 +32,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "17" # newer libraries require 17 now, force it everywhere
-
-      - name: Verify JDK17
-        # Default JDK varies depending on different runner flavors, make sure we are on 17
-        # Run a check that exits with error unless it is 17 version to future-proof against unexpected upgrades
-        run: java -fullversion 2>&1 | grep '17.0'
-        shell: bash
+          java-version: "21"
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 659d0a430c02..d433eb27102b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -26,13 +26,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "17" # newer libraries require 17, also change jitpack.yml
-
-      - name: Verify JDK17
-        # Default JDK varies depending on different runner flavors, make sure we are on 17
-        # Run a check that exits with error unless it is 17 version to future-proof against unexpected upgrades
-        run: java -fullversion 2>&1 | grep '17.0'
-        shell: bash
+          java-version: "21"
 
       - name: Install Release Utilities
         run: |
diff --git a/.github/workflows/tests_emulator.yml b/.github/workflows/tests_emulator.yml
index 035bee133825..f28a584cb191 100644
--- a/.github/workflows/tests_emulator.yml
+++ b/.github/workflows/tests_emulator.yml
@@ -44,13 +44,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "17" # newer libraries require 17 now, force it everywhere
-
-      - name: Verify JDK17
-        # Default JDK varies depending on different runner flavors, make sure we are on 17
-        # Run a check that exits with error unless it is 17 version to future-proof against unexpected upgrades
-        run: java -fullversion 2>&1 | grep '17.0'
-        shell: bash
+          java-version: "21"
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
diff --git a/.github/workflows/tests_unit.yml b/.github/workflows/tests_unit.yml
index 291faa5d897a..fa8a39c080d2 100644
--- a/.github/workflows/tests_unit.yml
+++ b/.github/workflows/tests_unit.yml
@@ -46,13 +46,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "17" # newer libraries require 17 now, force it everywhere
-
-      - name: Verify JDK17
-        # Default JDK varies depending on different runner flavors, make sure we are on 17
-        # Run a check that exits with error unless it is 17 version to future-proof against unexpected upgrades
-        run: java -fullversion 2>&1 | grep '17.0'
-        shell: bash
+          java-version: "21"
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 17a61ba8985f..c3a2b1e800c6 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "17" # newer libraries require 17 now, force it everywhere
+          java-version: "21"
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1
diff --git a/build.gradle b/build.gradle
index fbee5a90fe71..157c55d50246 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     ext.androidx_test_version = '1.5.0'
     ext.androidx_test_junit_version = '1.1.5'
     ext.robolectric_version = '4.11.1'
-    ext.android_gradle_plugin = "8.2.1"
+    ext.android_gradle_plugin = "8.2.2"
     ext.dokka_version = "1.9.10" // not the same with kotlin version!
     ext.uiautomator_version = "2.3.0-beta01"