diff --git a/build.gradle.kts b/build.gradle.kts
index 6d96d0365..65512e193 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -75,10 +75,10 @@ allprojects {
     // Dependencies
     dependencies {
         // Kotlin support
-        kotlin(property("dependencyKotlinStdIdentifier") as String)
-        kotlin(property("dependencyKotlinStdJavaIdentifier") as String)
-        implementation("${property("dependencyKotlinReflectIdentifier") as String}:${property("dependencyKotlinReflectVersion") as String}")
-        implementation("${property("dependencyKotlinDateTimeIdentifier") as String}:${property("dependencyKotlinDateTimeVersion") as String}")
+        kotlin(property("dependencyKotlin_StdIdentifier") as String)
+        kotlin(property("dependencyKotlin_StdLibIdentifier") as String)
+        implementation("${property("dependencyKotlin_ReflectIdentifier") as String}:${property("dependencyKotlinVersion") as String}")
+        implementation("${property("dependencyKotlin_DateTimeIdentifier") as String}:${property("dependencyKotlin_DateTimeVersion") as String}")
 
         // OSHI
         implementation("${property("dependencyOshiIdentifier") as String}:${property("dependencyOshiVersion") as String}")
@@ -87,9 +87,9 @@ allprojects {
         // -> Kotlin
         testImplementation(kotlin("test"))
         // -> JUnit
-        testImplementation(platform("${property("testDependencyJUnitBOMIdentifier")}:${property("testDependencyJUnitVersion")}"))
-        testImplementation("${property("testDependencyJUnitJupiterIdentifier")}")
-        testRuntimeOnly("${property("testDependencyJUnitPlatformLauncherIdentifier")}")
+        testImplementation(platform("${property("testDependencyJUnit_BOMIdentifier")}:${property("testDependencyJUnitVersion")}"))
+        testImplementation("${property("testDependencyJUnit_JupiterIdentifier")}")
+        testRuntimeOnly("${property("testDependencyJUnit_PlatformIdentifier")}")
         // -> sos!engine
         testImplementation(project(":testing"))
     }
@@ -97,12 +97,12 @@ allprojects {
     // Java
     java {
         // Java version
-        sourceCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
-        targetCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
+        sourceCompatibility = JavaVersion.valueOf("VERSION_${property("languageJava") as String}")
+        targetCompatibility = JavaVersion.valueOf("VERSION_${property("languageJava") as String}")
 
         if (!(hasProperty("java.skipToolchainSpecification") && property("java.skipToolchainSpecification") as String == "true"))
             toolchain {
-                languageVersion = JavaLanguageVersion.of(property("java") as String)
+                languageVersion = JavaLanguageVersion.of(property("languageJava") as String)
             }
     }
 
@@ -114,7 +114,7 @@ allprojects {
         verbose = true
 
         // Set target metadata
-        jvmTarget = JvmTarget.valueOf("JVM_${property("java") as String}")
+        jvmTarget = JvmTarget.valueOf("JVM_${property("languageJava") as String}")
     }
 
     // Unit testing
@@ -196,7 +196,7 @@ allprojects {
         dotGitDirectory = file("${rootProject.rootDir}/.git")
         failOnNoGitDirectory = false  // Allow continuing if .git directory is missing (tarball)
         extProperty = "git"
-        dateFormat = "yyyy-MM-dd'T'HH:mmZ"
+        dateFormat = "yyyy-MM-dd'T'HH:mm:ss.S'Z'"
         dateFormatTimeZone = "UTC"
     }
     // -> Copy task
diff --git a/dist/template-subproject/build.gradle.kts b/dist/template-subproject/build.gradle.kts
index 6a8a6d927..459f2807f 100644
--- a/dist/template-subproject/build.gradle.kts
+++ b/dist/template-subproject/build.gradle.kts
@@ -21,7 +21,7 @@
 // Dependencies
 dependencies {
     // Kotlin support
-    kotlin(property("dependencyKotlinStdIdentifier") as String)
+    kotlin(property("dependencyKotlin_StdIdentifier") as String)
 
     // sos!engine
     implementation(project(":base"))
diff --git a/gradle.properties b/gradle.properties
index 241e6baa0..8a923d002 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,15 +32,16 @@ versionFork=
 versionCompanion=
 
 # Language versions
-java=21
+languageJava=21
+languageKotlin=2.1.0
 
 # Dependencies
-dependencyKotlinStdIdentifier=stdlib
-dependencyKotlinStdJavaIdentifier=stdlib-jdk21
-dependencyKotlinReflectIdentifier=org.jetbrains.kotlin:kotlin-reflect
-dependencyKotlinReflectVersion=2.1.0
-dependencyKotlinDateTimeIdentifier=org.jetbrains.kotlinx:kotlinx-datetime
-dependencyKotlinDateTimeVersion=0.6.1
+dependencyKotlinVersion=2.1.0
+dependencyKotlin_StdIdentifier=stdlib
+dependencyKotlin_StdLibIdentifier=stdlib-jdk21
+dependencyKotlin_ReflectIdentifier=org.jetbrains.kotlin:kotlin-reflect
+dependencyKotlin_DateTimeIdentifier=org.jetbrains.kotlinx:kotlinx-datetime
+dependencyKotlin_DateTimeVersion=0.6.1
 dependencyOshiIdentifier=com.github.oshi:oshi-core-java11
 dependencyOshiVersion=6.6.5
 dependencyJansiIdentifier=org.fusesource:jansi
@@ -48,6 +49,6 @@ dependencyJansiVersion=2.4.1
 
 # Test dependencies
 testDependencyJUnitVersion=5.11.3
-testDependencyJUnitBOMIdentifier=org.junit:junit-bom
-testDependencyJUnitJupiterIdentifier=org.junit.jupiter:junit-jupiter
-testDependencyJUnitPlatformLauncherIdentifier=org.junit.platform:junit-platform-launcher
+testDependencyJUnit_BOMIdentifier=org.junit:junit-bom
+testDependencyJUnit_JupiterIdentifier=org.junit.jupiter:junit-jupiter
+testDependencyJUnit_PlatformIdentifier=org.junit.platform:junit-platform-launcher
diff --git a/testing/build.gradle.kts b/testing/build.gradle.kts
index 71bbacd37..440c13adf 100644
--- a/testing/build.gradle.kts
+++ b/testing/build.gradle.kts
@@ -21,7 +21,7 @@
 // Dependencies
 dependencies {
     // Kotlin support
-    kotlin(property("dependencyKotlinStdIdentifier") as String)
+    kotlin(property("dependencyKotlin_StdIdentifier") as String)
 
     // sos!engine
     implementation(project(":base"))
@@ -30,6 +30,6 @@ dependencies {
     // -> Kotlin
     implementation(kotlin("test"))
     // -> JUnit
-    implementation(platform("${property("testDependencyJUnitBOMIdentifier")}:${property("testDependencyJUnitVersion")}"))
-    implementation("${property("testDependencyJUnitJupiterIdentifier")}")
+    implementation(platform("${property("testDependencyJUnit_BOMIdentifier")}:${property("testDependencyJUnitVersion")}"))
+    implementation("${property("testDependencyJUnit_JupiterIdentifier")}")
 }