diff --git a/aws-crt-kotlin/build.gradle.kts b/aws-crt-kotlin/build.gradle.kts
index fe5570be..6188d212 100644
--- a/aws-crt-kotlin/build.gradle.kts
+++ b/aws-crt-kotlin/build.gradle.kts
@@ -33,17 +33,6 @@ configureKmpTargets()
 kotlin {
     explicitApi()
 
-    // FIXME - move to repo-tools plugin
-    macosX64()
-    macosArm64()
-    iosSimulatorArm64()
-    iosArm64()
-    iosX64()
-    linuxX64()
-    linuxArm64()
-    // FIXME - setup docker files and cmake tasks appropriately
-    // mingwX64()
-
     sourceSets {
         val commonMain by getting {
             dependencies {
diff --git a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt
index ed0ff573..a8c1ca7d 100644
--- a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt
+++ b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt
@@ -156,8 +156,9 @@ private fun Project.registerCmakeBuildTask(
                 relativeBuildDir,
                 "--config",
                 buildType.toString(),
-                "--parallel",
-                System.getProperty("org.gradle.workers.max", "16"),
+                // FIXME There is a parallelism issue between linuxx64 and linuxarm64 causing flaky builds
+//                "--parallel",
+//                System.getProperty("org.gradle.workers.max", "16"),
             )
 
             val osxSdk = knTarget.konanTarget.osxDeviceSdkName
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8b5b8619..2bbbb1e7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin-version = "2.0.21"
 
-aws-kotlin-repo-tools-version = "0.4.13"
+aws-kotlin-repo-tools-version = "0.4.14-kn"
 
 # libs
 crt-java-version = "0.31.3"
@@ -9,20 +9,13 @@ coroutines-version = "1.9.0"
 
 # testing
 junit-version = "5.10.1"
-kotest-version = "5.8.0"
 mock-server-version = "5.15.0"
-# fixme - remove in favor of clikt
-kotlinx-cli-version = "0.3.6"
-kotlinx-io-version = "0.3.1"
-
 
 [libraries]
 aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }
 crt-java = { module = "software.amazon.awssdk.crt:aws-crt", version.ref = "crt-java-version" }
 
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version"}
-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin-version"}
-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-version" }
 kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin-version" }
 
 
@@ -30,15 +23,10 @@ kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines-version" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines-version" }
 kotlinx-coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines-version" }
-kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli", version.ref = "kotlinx-cli-version" }
-kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io-version"}
 
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-version" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-version" }
 
-kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest-version" }
-kotest-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest-version" }
-
 mockserver-netty = { module = "org.mock-server:mockserver-netty", version.ref = "mock-server-version" }
 
 [plugins]