diff --git a/dispatch-android-espresso/build.gradle.kts b/dispatch-android-espresso/build.gradle.kts
index 198cd2aa4..dba164207 100644
--- a/dispatch-android-espresso/build.gradle.kts
+++ b/dispatch-android-espresso/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidLibrary)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
   id(Plugins.mavenPublish)
   id(Plugins.dokka)
 }
@@ -44,10 +44,9 @@ dependencies {
   api(Libs.AndroidX.Test.Espresso.idlingResource)
   api(Libs.JUnit.jUnit4)
   api(Libs.Kotlinx.Coroutines.core)
+  api(Libs.Kotlinx.Coroutines.coreJvm)
 
   api(project(":dispatch-core"))
-
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.android)
 
   testImplementation(Libs.Kotest.assertions)
diff --git a/dispatch-android-espresso/samples/build.gradle.kts b/dispatch-android-espresso/samples/build.gradle.kts
index ce24cbda5..92b5b6b60 100644
--- a/dispatch-android-espresso/samples/build.gradle.kts
+++ b/dispatch-android-espresso/samples/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidLibrary)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
 }
 
 android {
@@ -38,8 +38,6 @@ android {
 }
 
 dependencies {
-
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.coreJvm)
 
   implementation(project(":dispatch-core"))
diff --git a/dispatch-android-lifecycle-extensions/build.gradle.kts b/dispatch-android-lifecycle-extensions/build.gradle.kts
index 8f97a504a..708b9677b 100644
--- a/dispatch-android-lifecycle-extensions/build.gradle.kts
+++ b/dispatch-android-lifecycle-extensions/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidLibrary)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
   id(Plugins.mavenPublish)
   id(Plugins.dokka)
 }
@@ -50,8 +50,6 @@ dependencies {
   api(Libs.Kotlinx.Coroutines.coreJvm)
 
   api(project(":dispatch-android-lifecycle"))
-
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.android)
 
   implementation(project(":dispatch-core"))
diff --git a/dispatch-android-lifecycle-extensions/samples/build.gradle.kts b/dispatch-android-lifecycle-extensions/samples/build.gradle.kts
index 4bd3e194c..a5d5392c4 100644
--- a/dispatch-android-lifecycle-extensions/samples/build.gradle.kts
+++ b/dispatch-android-lifecycle-extensions/samples/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidLibrary)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
 }
 
 android {
@@ -42,7 +42,6 @@ dependencies {
   implementation(Libs.AndroidX.Fragment.core)
   implementation(Libs.AndroidX.Lifecycle.common)
   implementation(Libs.JUnit.jUnit4)
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.core)
 
   implementation(project(":dispatch-android-espresso"))
diff --git a/dispatch-android-lifecycle/build.gradle.kts b/dispatch-android-lifecycle/build.gradle.kts
index 3307531e8..a0b0f5e09 100644
--- a/dispatch-android-lifecycle/build.gradle.kts
+++ b/dispatch-android-lifecycle/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidLibrary)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
   id(Plugins.mavenPublish)
   id(Plugins.dokka)
 }
@@ -54,7 +54,6 @@ dependencies {
   implementation(Libs.AndroidX.Lifecycle.liveData)
   implementation(Libs.AndroidX.Lifecycle.liveDataKtx)
   implementation(Libs.AndroidX.Lifecycle.runtime)
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.android)
 
   testImplementation(Libs.AndroidX.Lifecycle.runtime)
diff --git a/dispatch-android-lifecycle/samples/build.gradle.kts b/dispatch-android-lifecycle/samples/build.gradle.kts
index 141219e6d..e17ed570d 100644
--- a/dispatch-android-lifecycle/samples/build.gradle.kts
+++ b/dispatch-android-lifecycle/samples/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidLibrary)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
 }
 
 android {
@@ -46,7 +46,6 @@ dependencies {
   implementation(Libs.AndroidX.Lifecycle.viewModel)
   implementation(Libs.JUnit.jUnit4)
   implementation(Libs.JUnit.jUnit5Api)
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.core)
 
   implementation(project(":dispatch-android-lifecycle"))
diff --git a/dispatch-android-viewmodel/build.gradle.kts b/dispatch-android-viewmodel/build.gradle.kts
index f646a4cbe..18444c8f0 100644
--- a/dispatch-android-viewmodel/build.gradle.kts
+++ b/dispatch-android-viewmodel/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidLibrary)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
   id(Plugins.mavenPublish)
   id(Plugins.dokka)
 }
@@ -47,7 +47,6 @@ dependencies {
   api(Libs.Kotlinx.Coroutines.coreJvm)
 
   implementation(Libs.AndroidX.Lifecycle.viewModelKtx)
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.android)
 
   testImplementation(Libs.AndroidX.Test.Espresso.core)
diff --git a/dispatch-android-viewmodel/samples/build.gradle.kts b/dispatch-android-viewmodel/samples/build.gradle.kts
index a62af14e5..cad00ac8c 100644
--- a/dispatch-android-viewmodel/samples/build.gradle.kts
+++ b/dispatch-android-viewmodel/samples/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidLibrary)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
 }
 
 android {
@@ -38,8 +38,6 @@ android {
 }
 
 dependencies {
-
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.core)
   implementation(Libs.Kotlinx.Coroutines.test)
 
diff --git a/dispatch-core/build.gradle.kts b/dispatch-core/build.gradle.kts
index ab7fa12ff..2f3da2b08 100644
--- a/dispatch-core/build.gradle.kts
+++ b/dispatch-core/build.gradle.kts
@@ -14,7 +14,7 @@
  */
 
 plugins {
-  id(Plugins.kotlin)
+  kotlin("jvm")
   id(Plugins.mavenPublish)
   id(Plugins.dokka)
   id(Plugins.atomicFu)
@@ -25,8 +25,6 @@ dependencies {
   api(Libs.Kotlinx.Coroutines.core)
   api(Libs.Kotlinx.Coroutines.coreJvm)
 
-  implementation(Libs.Kotlin.stdlib)
-
   testImplementation(Libs.JUnit.jUnit5)
   testImplementation(Libs.Kotest.assertions)
   testImplementation(Libs.Kotest.properties)
diff --git a/dispatch-core/samples/build.gradle.kts b/dispatch-core/samples/build.gradle.kts
index 78e98e462..fef0b037e 100644
--- a/dispatch-core/samples/build.gradle.kts
+++ b/dispatch-core/samples/build.gradle.kts
@@ -16,15 +16,13 @@
 import kotlinx.atomicfu.plugin.gradle.*
 
 plugins {
-  id(Plugins.kotlin)
+  kotlin("jvm")
 }
 
 sourceSets["test"].java.srcDir("test")
 
 dependencies {
 
-  implementation(Libs.Kotlin.stdlib)
-
   testImplementation(Libs.JUnit.jUnit5)
   testImplementation(Libs.Kotest.assertions)
   testImplementation(Libs.Kotest.properties)
diff --git a/dispatch-detekt/build.gradle.kts b/dispatch-detekt/build.gradle.kts
index 0b771d505..e4afb9769 100644
--- a/dispatch-detekt/build.gradle.kts
+++ b/dispatch-detekt/build.gradle.kts
@@ -14,7 +14,7 @@
  */
 
 plugins {
-  id(Plugins.kotlin)
+  kotlin("jvm")
   id(Plugins.mavenPublish)
   id(Plugins.dokka)
 }
@@ -24,8 +24,6 @@ dependencies {
   api(Libs.Detekt.api)
   api(Libs.Kotlin.compiler)
 
-  implementation(Libs.Kotlin.stdlib)
-
   // detekt-test leaks transitive dependencies upon AssertJ and Spek
   // https://github.com/detekt/detekt/issues/3082
   testImplementation("org.assertj:assertj-core:3.17.2")
diff --git a/dispatch-detekt/samples/build.gradle.kts b/dispatch-detekt/samples/build.gradle.kts
index 7fa3b96e9..bd6f93584 100644
--- a/dispatch-detekt/samples/build.gradle.kts
+++ b/dispatch-detekt/samples/build.gradle.kts
@@ -16,14 +16,12 @@
 import kotlinx.atomicfu.plugin.gradle.*
 
 plugins {
-  id(Plugins.kotlin)
+  kotlin("jvm")
 }
 
 sourceSets["test"].java.srcDir("test")
 
 dependencies {
-
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.core)
   implementation(Libs.Kotlinx.Coroutines.coreJvm)
 
diff --git a/dispatch-internal-test-android/build.gradle.kts b/dispatch-internal-test-android/build.gradle.kts
index 032d820a5..9bda98879 100644
--- a/dispatch-internal-test-android/build.gradle.kts
+++ b/dispatch-internal-test-android/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidLibrary)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
 }
 
 android {
@@ -50,6 +50,5 @@ dependencies {
 
   implementation(Libs.AndroidX.Lifecycle.runtimeKtx)
   implementation(Libs.Kotlin.reflect)
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.android)
 }
diff --git a/dispatch-internal-test/build.gradle.kts b/dispatch-internal-test/build.gradle.kts
index 765f6e3d8..fb17590b7 100644
--- a/dispatch-internal-test/build.gradle.kts
+++ b/dispatch-internal-test/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.atomicFu)
-  id(Plugins.kotlin)
+  kotlin("jvm")
 }
 
 dependencies {
@@ -32,7 +32,6 @@ dependencies {
   implementation(Libs.Kotest.commonJvm)
   implementation(Libs.Kotest.runner)
   implementation(Libs.Kotlin.reflect)
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlin.test)
   implementation(Libs.Kotlin.testCommon)
   implementation(Libs.Kotlinx.Coroutines.test)
diff --git a/dispatch-sample/build.gradle.kts b/dispatch-sample/build.gradle.kts
index ebb3c78bf..5368d6835 100644
--- a/dispatch-sample/build.gradle.kts
+++ b/dispatch-sample/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.androidApplication)
-  id(Plugins.kotlinAndroid)
+  kotlin("android")
   id(Plugins.kotlinAndroidExtensions)
 }
 
@@ -56,7 +56,6 @@ dependencies {
   implementation(Libs.AndroidX.Lifecycle.common)
   implementation(Libs.AndroidX.Lifecycle.extensions)
   implementation(Libs.JakeWharton.timber)
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.android)
   implementation(Libs.Kotlinx.Coroutines.core)
 
diff --git a/dispatch-test-junit4/build.gradle.kts b/dispatch-test-junit4/build.gradle.kts
index 578c73fa9..0fad3286a 100644
--- a/dispatch-test-junit4/build.gradle.kts
+++ b/dispatch-test-junit4/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.atomicFu)
-  id(Plugins.kotlin)
+  kotlin("jvm")
   id(Plugins.mavenPublish)
   id(Plugins.dokka)
 }
@@ -27,8 +27,6 @@ dependencies {
 
   api(project(":dispatch-core"))
   api(project(":dispatch-test"))
-
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.core)
   implementation(Libs.Kotlinx.Coroutines.coreJvm)
 
diff --git a/dispatch-test-junit4/samples/build.gradle.kts b/dispatch-test-junit4/samples/build.gradle.kts
index f27e9b9e6..501004b03 100644
--- a/dispatch-test-junit4/samples/build.gradle.kts
+++ b/dispatch-test-junit4/samples/build.gradle.kts
@@ -14,15 +14,13 @@
  */
 
 plugins {
-  id(Plugins.kotlin)
+  kotlin("jvm")
 }
 
 sourceSets["test"].java.srcDir("test")
 
 dependencies {
 
-  implementation(Libs.Kotlin.stdlib)
-
   testImplementation(Libs.JUnit.jUnit4)
   testImplementation(Libs.Kotest.assertions)
   testImplementation(Libs.Kotest.properties)
diff --git a/dispatch-test-junit5/build.gradle.kts b/dispatch-test-junit5/build.gradle.kts
index 06d647609..df957e912 100644
--- a/dispatch-test-junit5/build.gradle.kts
+++ b/dispatch-test-junit5/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.atomicFu)
-  id(Plugins.kotlin)
+  kotlin("jvm")
   id(Plugins.mavenPublish)
   id(Plugins.dokka)
 }
@@ -28,7 +28,6 @@ dependencies {
 
   implementation(Libs.JUnit.jUnit5)
   implementation(Libs.Kotlin.reflect)
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.core)
   implementation(Libs.Kotlinx.Coroutines.coreJvm)
   implementation(Libs.Kotlinx.Coroutines.test)
diff --git a/dispatch-test-junit5/samples/build.gradle.kts b/dispatch-test-junit5/samples/build.gradle.kts
index 971a6b988..41f056f57 100644
--- a/dispatch-test-junit5/samples/build.gradle.kts
+++ b/dispatch-test-junit5/samples/build.gradle.kts
@@ -16,14 +16,12 @@
 import kotlinx.atomicfu.plugin.gradle.*
 
 plugins {
-  id(Plugins.kotlin)
+  kotlin("jvm")
 }
 
 sourceSets["test"].java.srcDir("test")
 
 dependencies {
-
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.test)
 
   testImplementation(Libs.JUnit.jUnit5)
diff --git a/dispatch-test/build.gradle.kts b/dispatch-test/build.gradle.kts
index 5fd25be79..ea364e87c 100644
--- a/dispatch-test/build.gradle.kts
+++ b/dispatch-test/build.gradle.kts
@@ -15,7 +15,7 @@
 
 plugins {
   id(Plugins.atomicFu)
-  id(Plugins.kotlin)
+  kotlin("jvm")
   id(Plugins.mavenPublish)
   id(Plugins.dokka)
 }
@@ -23,6 +23,7 @@ plugins {
 dependencies {
 
   api(Libs.Kotlinx.Coroutines.core)
+  api(Libs.Kotlinx.Coroutines.coreJvm)
   api(Libs.Kotlinx.Coroutines.test)
 
   api(project(":dispatch-core"))
@@ -30,7 +31,6 @@ dependencies {
   implementation(Libs.JUnit.jUnit5)
   implementation(Libs.JUnit.jUnit5Api)
   implementation(Libs.JUnit.jUnit5Vintage)
-  implementation(Libs.Kotlin.stdlib)
 
   testImplementation(Libs.Kotest.assertions)
   testImplementation(Libs.Kotest.properties)
diff --git a/dispatch-test/samples/build.gradle.kts b/dispatch-test/samples/build.gradle.kts
index 5ab55cff2..4d5e3b4eb 100644
--- a/dispatch-test/samples/build.gradle.kts
+++ b/dispatch-test/samples/build.gradle.kts
@@ -16,14 +16,12 @@
 import kotlinx.atomicfu.plugin.gradle.*
 
 plugins {
-  id(Plugins.kotlin)
+  kotlin("jvm")
 }
 
 sourceSets["test"].java.srcDir("test")
 
 dependencies {
-
-  implementation(Libs.Kotlin.stdlib)
   implementation(Libs.Kotlinx.Coroutines.core)
 
   implementation(project(":dispatch-core"))