diff --git a/annotationProcessor/gradle.lockfile b/annotationProcessor/gradle.lockfile
index a0ee8480d..7886f555a 100644
--- a/annotationProcessor/gradle.lockfile
+++ b/annotationProcessor/gradle.lockfile
@@ -381,7 +381,7 @@ org.jetbrains.kotlin:kotlin-reflect:1.9.25=productionRuntimeClasspath,runtimeCla
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.25=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.25=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.25=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.25=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
diff --git a/buildSrc/src/main/groovy/tanagra.java-conventions.gradle b/buildSrc/src/main/groovy/tanagra.java-conventions.gradle
index 7852c2a8f..86ba17f60 100644
--- a/buildSrc/src/main/groovy/tanagra.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/tanagra.java-conventions.gradle
@@ -60,6 +60,7 @@ dependencyManagement {
         // addresses security vulnerabilities
         dependency "ch.qos.logback:logback-classic:${vLogback}"
         dependency "ch.qos.logback:logback-core:${vLogback}"
+        dependency 'org.jetbrains.kotlin:kotlin-stdlib:2.1.0'
     }
 }
 
diff --git a/indexer/gradle.lockfile b/indexer/gradle.lockfile
index cafaa9602..6e9ba1596 100644
--- a/indexer/gradle.lockfile
+++ b/indexer/gradle.lockfile
@@ -315,12 +315,10 @@ org.jacoco:org.jacoco.report:0.8.12=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
 org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=compileClasspath,testCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.20=compileClasspath,testCompileClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.0.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
diff --git a/service/gradle.lockfile b/service/gradle.lockfile
index 775e571ba..de484ee48 100644
--- a/service/gradle.lockfile
+++ b/service/gradle.lockfile
@@ -400,7 +400,7 @@ org.jetbrains.kotlin:kotlin-reflect:1.9.25=compileProtoPath,productionRuntimeCla
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.25=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.25=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.25=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.25=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath