diff --git a/api-client-ktor/build.gradle.kts b/api-client-ktor/build.gradle.kts
index 479815d..d0f3690 100644
--- a/api-client-ktor/build.gradle.kts
+++ b/api-client-ktor/build.gradle.kts
@@ -21,12 +21,7 @@ val generatorTask = tasks.register("generateKtorClient", GenerateTask::class) {
     inputSpec = project(":redocly")
         .layout.projectDirectory
         .file("bundled/git-connector-v1.yaml")
-        .asFile.absolutePath
-    outputDir =
-        layout.buildDirectory
-            .dir("generated/ktor")
-            .get()
-            .asFile.absolutePath
+    outputDir = layout.buildDirectory.dir("generated/ktor")
     //importMappings.put("UUID", "kotlin.uuid.Uuid")
 }
 
diff --git a/client-ts/build.gradle.kts b/client-ts/build.gradle.kts
index 122301e..456eaeb 100644
--- a/client-ts/build.gradle.kts
+++ b/client-ts/build.gradle.kts
@@ -33,8 +33,6 @@ fun registerNpmPackageTasks(
                 project(":redocly")
                     .layout.buildDirectory
                     .file("joined.yaml")
-                    .get()
-                    .asFile.absolutePath
             configOptions =
                 mapOf(
                     "npmRepository" to "https://artifacts.itemis.cloud/repository/npm-open/",
@@ -45,11 +43,7 @@ fun registerNpmPackageTasks(
             gitUserId = "modelix"
             gitRepoId = "modelix.openapi"
             generatorName = openApiGeneratorName
-            outputDir =
-                layout.buildDirectory
-                    .dir("generate/$openApiGeneratorName")
-                    .get()
-                    .asFile.absolutePath
+            outputDir = clientBuildDir
         }
 
     // Task to run 'pnpm install'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aec0d99..af2d61b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,6 +24,6 @@ ktor-serialization-json = { group = "io.ktor", name = "ktor-serialization-kotlin
 gitVersion = { id = "com.palantir.git-version", version = "5.1.0" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-openapi-generator = {id = "org.openapi.generator", version = "7.21.0"}
+openapi-generator = {id = "org.openapi.generator", version = "7.25.0"}
 fabrikt = { id = "ch.acanda.gradle.fabrikt", version = "1.40.0" }
 node = {id = "com.github.node-gradle.node", version = "7.1.0"}