diff --git a/build.gradle.kts b/build.gradle.kts
index d098c198..111b841c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
-    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.kotlin.multiplatform.library) apply false
     alias(libs.plugins.kotlinter) apply false
     alias(libs.plugins.dokka)
     alias(libs.plugins.android.publish) apply false
diff --git a/coroutines/build.gradle.kts b/coroutines/build.gradle.kts
index 6c455344..2e374135 100644
--- a/coroutines/build.gradle.kts
+++ b/coroutines/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.library")
+    id("com.android.kotlin.multiplatform.library")
     kotlin("multiplatform")
     id("org.jmailen.kotlinter")
     jacoco
@@ -15,7 +15,21 @@ kotlin {
 
     jvm()
     js().browser()
-    androidTarget().publishLibraryVariants("debug", "release")
+    android {
+        namespace = "com.juul.tuulbox.coroutines"
+        compileSdk = libs.versions.android.compile.get().toInt()
+        minSdk = 16
+
+        androidResources { enable = true }
+
+        withHostTest {}
+
+        lint {
+            abortOnError = true
+            warningsAsErrors = true
+            disable += "GradleDependency"
+        }
+    }
     macosX64()
     macosArm64()
     iosX64()
@@ -53,16 +67,3 @@ kotlin {
         }
     }
 }
-
-android {
-    compileSdk = libs.versions.android.compile.get().toInt()
-    defaultConfig.minSdk = 16
-    
-    namespace = "com.juul.tuulbox.coroutines"
-
-    lint {
-        abortOnError = true
-        warningsAsErrors = true
-        disable += "GradleDependency"
-    }
-}
diff --git a/gradle.properties b/gradle.properties
index ec1a818c..54d7bff5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,10 +9,6 @@ kotlin.native.ignoreIncorrectDependencies=true
 # Android Configuration
 android.useAndroidX=true
 
-# Android Build Features
-android.defaults.buildfeatures.buildconfig=false
-android.defaults.buildfeatures.resvalues=false
-
 org.gradle.parallel=true
 
 # Publication configuration
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 84c47878..b545b39f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
 
 [plugins]
-android-library = { id = "com.android.library", version = "8.13.2" }
+android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version = "9.2.1" }
 android-publish = { id = "com.vanniktech.maven.publish", version = "0.36.0" }
 api = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.18.1" }
 atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version = "0.33.0" }
diff --git a/temporal/build.gradle.kts b/temporal/build.gradle.kts
index 495e0a24..21535c12 100644
--- a/temporal/build.gradle.kts
+++ b/temporal/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.library")
+    id("com.android.kotlin.multiplatform.library")
     kotlin("multiplatform")
     id("org.jmailen.kotlinter")
     jacoco
@@ -21,7 +21,19 @@ kotlin {
             }
         }
     }
-    androidTarget().publishLibraryVariants("debug", "release")
+    android {
+        namespace = "com.juul.tuulbox.temporal"
+        compileSdk = libs.versions.android.compile.get().toInt()
+        minSdk = 16
+
+        withHostTest {}
+
+        lint {
+            abortOnError = true
+            warningsAsErrors = true
+            disable += "GradleDependency"
+        }
+    }
     wasmJs().browser()
 
     applyDefaultHierarchyTemplate()
@@ -53,16 +65,3 @@ kotlin {
         }
     }
 }
-
-android {
-    compileSdk = libs.versions.android.compile.get().toInt()
-    defaultConfig.minSdk = 16
-
-    namespace = "com.juul.tuulbox.temporal"
-
-    lint {
-        abortOnError = true
-        warningsAsErrors = true
-        disable += "GradleDependency"
-    }
-}
diff --git a/temporal/src/androidUnitTest/kotlin/AndroidIgnore.kt b/temporal/src/androidHostTest/kotlin/AndroidIgnore.kt
similarity index 100%
rename from temporal/src/androidUnitTest/kotlin/AndroidIgnore.kt
rename to temporal/src/androidHostTest/kotlin/AndroidIgnore.kt