diff --git a/docker/versions.dockerfile b/docker/versions.dockerfile
index 0273e2ee6a03b..fe115ece091e3 100644
--- a/docker/versions.dockerfile
+++ b/docker/versions.dockerfile
@@ -10,7 +10,7 @@ ARG DART_VERSION=2.18.4
 ARG DOTNET_VERSION=6.0
 ARG GO_VERSION=1.23.0
 ARG HASKELL_STACK_VERSION=2.13.1
-ARG JAVA_VERSION=17
+ARG JAVA_VERSION=21
 ARG LICENSEE_VERSION=9.15.3
 ARG NODEJS_VERSION=20.14.0
 ARG NPM_VERSION=10.8.3
diff --git a/gradle.properties b/gradle.properties
index 6a9fc5c4cc181..479e76f65eeb0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,7 +24,7 @@ org.gradle.parallel = true
 kotlin.code.style = official
 
 # The version of the JDK to use for building ORT.
-javaLanguageVersion = 11
+javaLanguageVersion = 21
 
 # The version of the SPDX license list which is used to import license texts and generate SPDX enums. Must be a valid
 # tag, see https://github.com/spdx/license-list-data/tags.
diff --git a/plugins/scanners/scanoss/src/main/kotlin/ScanOss.kt b/plugins/scanners/scanoss/src/main/kotlin/ScanOss.kt
index aede5691541e9..91d6df147ba34 100644
--- a/plugins/scanners/scanoss/src/main/kotlin/ScanOss.kt
+++ b/plugins/scanners/scanoss/src/main/kotlin/ScanOss.kt
@@ -98,7 +98,7 @@ class ScanOss internal constructor(
         val result = service.scan(
             wfpString,
             context.labels["scanOssContext"],
-            context.labels["scanOssId"]?.toIntOrNull() ?: Thread.currentThread().id.toInt()
+            context.labels["scanOssId"]?.toIntOrNull() ?: Thread.currentThread().threadId().toInt()
         )
 
         // Replace the anonymized UUIDs by their file paths.