diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9208b7bd1..356706aee 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -138,6 +138,14 @@ android {
         targetCompatibility = JavaVersion.toVersion(javaTarget.target)
     }
 
+    java {
+	    // Use Java 17 toolchain even if a higher JDK runs the build.
+        // We still use Java 8 for now which higher JDKs have deprecated.
+	    toolchain {
+		    languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
+    	}
+    }
+
     lint {
         abortOnError = false
         checkReleaseBuilds = false
diff --git a/gradle.properties b/gradle.properties
index 048fdb94a..0168ae437 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,3 +23,6 @@ android.nonTransitiveRClass=true
 
 org.gradle.caching=true
 org.gradle.configuration-cache=true
+
+# Compiling with Java 8 is deprecated but we still use it for now
+android.javaCompile.suppressSourceTargetDeprecationWarning=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f022cb48c..088cad6d5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -48,6 +48,7 @@ workRuntime = "2.10.5"
 workRuntimeKtx = "2.10.5"
 
 jvmTarget = "1.8"
+jdkToolchain = "17"
 minSdk = "21"
 compileSdk = "36"
 targetSdk = "36"