diff --git a/gradle.properties b/gradle.properties
index f6a971f..3859eb1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # VERSION: 0.0.3
 
 ### Versions ###
-versions.java=17
+versions.java=21
 # plugins
 versions_kotlin=2.2.20
 versions_spring_boot=4.0.2
@@ -15,7 +15,6 @@ versions.testcontainers=1.18.1
 versions.otel=1.12.1
 versions.lombok=1.18.36
 versions.hibernate.spatial=6.5.1.Final
-versions.camunda=8.4.15
 versions.open-api=3.0.1
 versions.spring.boot.admin=4.0.1
 
diff --git a/services/pcp-tgu-service/build.gradle.kts b/services/pcp-tgu-service/build.gradle.kts
index 733dc7b..3b4bccb 100644
--- a/services/pcp-tgu-service/build.gradle.kts
+++ b/services/pcp-tgu-service/build.gradle.kts
@@ -11,7 +11,7 @@ version = "0.0.1"
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of((property("versions.java") as String).toInt())
     }
 }