diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e285b0cbcc16..782dbf70e67b 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/usr/lib/android-sdk
 
 RUN apt-get update -y
-RUN apt-get install -y unzip wget openjdk-17-jdk vim
+RUN apt-get install -y unzip wget openjdk-24-jdk vim
 
 RUN wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O /tmp/commandlinetools.zip
 RUN cd /tmp && unzip commandlinetools.zip
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 7e65adfe1238..3d08124a79c5 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -57,11 +57,11 @@ jobs:
                     persist-credentials: false
                     repository: ${{ steps.get-vars.outputs.repo }}
                     ref: ${{ steps.get-vars.outputs.branch }}
-            -   name: Set up JDK 17
+            -   name: Set up JDK 24
                 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 24
             -   name: Install dependencies
                 run: |
                     sudo apt install python3-defusedxml
diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml
index 1a9cb1950fc8..4182be1abe68 100644
--- a/.github/workflows/assembleFlavors.yml
+++ b/.github/workflows/assembleFlavors.yml
@@ -23,11 +23,11 @@ jobs:
                 flavor: [ Generic, Gplay, Huawei ]
         steps:
             -   uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-            -   name: set up JDK 17
+            -   name: set up JDK 24
                 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 24
             -   uses: gradle/actions/wrapper-validation@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
             -   name: Build ${{ matrix.flavor }}
                 run: |
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 5129812ab3d8..01bb8c662dca 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -23,10 +23,10 @@ jobs:
                 task: [ detekt, spotlessKotlinCheck, lint ]
         steps:
             -   uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-            -   name: Set up JDK 17
+            -   name: Set up JDK 24
                 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 24
             -   name: Check ${{ matrix.task }}
                 run: ./gradlew ${{ matrix.task }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index b0784ea3287d..7b80a9fa0947 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -46,11 +46,11 @@ jobs:
         uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
         with:
           languages: ${{ matrix.language }}
-      - name: Set up JDK 17
+      - name: Set up JDK 24
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 24
       - name: Assemble
         run: |
           mkdir -p "$HOME/.gradle"
diff --git a/.github/workflows/detectWrongSettings.yml b/.github/workflows/detectWrongSettings.yml
index 9ac300ef1f57..8c0ad8279374 100644
--- a/.github/workflows/detectWrongSettings.yml
+++ b/.github/workflows/detectWrongSettings.yml
@@ -21,10 +21,10 @@ jobs:
 
         steps:
             -   uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-            -   name: Set up JDK 17
+            -   name: Set up JDK 24
                 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 24
             -   name: Detect SNAPSHOT
                 run: scripts/analysis/detectWrongSettings.sh
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index e842ee9e7a06..ed71542cb8f1 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -29,12 +29,12 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: set up JDK 17
+      - name: set up JDK 24
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         if: ${{ steps.check-secrets.outputs.ok == 'true' }}
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 24
 
       - name: Build QA
         if: ${{ steps.check-secrets.outputs.ok == 'true' }}
diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml
index 4738615b698d..8b8d2c24dcbf 100644
--- a/.github/workflows/screenShotTest.yml
+++ b/.github/workflows/screenShotTest.yml
@@ -46,7 +46,7 @@ jobs:
             -   uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 24
 
             -   name: Enable KVM group perms
                 run: |
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 732d0a26abb8..d8a894cd0f98 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -24,11 +24,11 @@ jobs:
         steps:
             - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-            - name: Set up JDK 17
+            - name: Set up JDK 24
               uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
               with:
                   distribution: "temurin"
-                  java-version: 17
+                  java-version: 24
 
             - name: Delete old comments
               env:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7c5764b7af6b..f0415fbb1bb8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -205,8 +205,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_24
+        targetCompatibility = JavaVersion.VERSION_24
     }
 
     lint {
@@ -247,7 +247,7 @@ kapt.useBuildCache = true
 
 ksp.arg("room.schemaLocation", "$projectDir/schemas")
 
-kotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+kotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_24)
 
 spotless.kotlin {
     target("**/*.kt")
diff --git a/appscan/build.gradle.kts b/appscan/build.gradle.kts
index 5311613b85c7..dced118c27b9 100644
--- a/appscan/build.gradle.kts
+++ b/appscan/build.gradle.kts
@@ -27,8 +27,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_24
+        targetCompatibility = JavaVersion.VERSION_24
     }
 
     lint.targetSdk = 36
@@ -36,7 +36,7 @@ android {
 }
 
 kotlin.compilerOptions {
-    jvmTarget.set(JvmTarget.JVM_17)
+    jvmTarget.set(JvmTarget.JVM_24)
     freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
 }