diff --git a/examples/kotlin-multiplatform/build.gradle b/examples/kotlin-multiplatform/build.gradle
index c80cc595..af6e7597 100644
--- a/examples/kotlin-multiplatform/build.gradle
+++ b/examples/kotlin-multiplatform/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.konan.target.HostManager
-import org.jetbrains.kotlin.konan.target.KonanTarget
 import kotlinx.benchmark.gradle.JsBenchmarksExecutor
 
 plugins {
@@ -23,10 +21,14 @@ kotlin {
         compilations.create("builtInExecutor") { associateWith(compilations.main) }
     }
     wasm('wasmJs') { d8() }
-    if (HostManager.host == KonanTarget.MACOS_X64.INSTANCE) macosX64('native')
-    if (HostManager.host == KonanTarget.MACOS_ARM64.INSTANCE) macosArm64('native')
-    if (HostManager.hostIsLinux) linuxX64('native')
-    if (HostManager.hostIsMingw) mingwX64('native')
+
+    // Native targets
+    macosX64()
+    macosArm64()
+    linuxX64()
+    mingwX64()
+
+    applyDefaultHierarchyTemplate()
 
     sourceSets.configureEach {
         languageSettings {
@@ -50,9 +52,7 @@ kotlin {
             jsBuiltInExecutor.dependsOn(it)
         }
 
-        nativeMain {
-            dependsOn(commonMain)
-        }
+        nativeMain {}
     }
 }
 
@@ -121,6 +121,11 @@ benchmark {
             jsBenchmarksExecutor = JsBenchmarksExecutor.BuiltIn
         }
         register("wasmJs")
-        register("native")
+
+        // Native targets
+        register("macosX64")
+        register("macosArm64")
+        register("linuxX64")
+        register("mingwX64")
     }
 }
\ No newline at end of file
diff --git a/runtime/build.gradle b/runtime/build.gradle
index 32e0cecf..2f5892c5 100644
--- a/runtime/build.gradle
+++ b/runtime/build.gradle
@@ -9,48 +9,40 @@ repositories {
 }
 
 kotlin {
-    infra {
-        // According to https://kotlinlang.org/docs/native-target-support.html
+    // According to https://kotlinlang.org/docs/native-target-support.html
 
-        // Tier 1
-        target("linuxX64")
+    // Tier 1
+    linuxX64()
+    macosX64()
+    macosArm64()
+    iosSimulatorArm64()
+    iosX64()
 
-        // Tier 2
-        target("linuxArm64")
+    // Tier 2
+    linuxArm64()
+    watchosSimulatorArm64()
+    watchosX64()
+    watchosArm32()
+    watchosArm64()
+    tvosSimulatorArm64()
+    tvosX64()
+    tvosArm64()
+    iosArm64()
 
-        // Tier 3
-        target("androidNativeArm32")
-        target("androidNativeArm64")
-        target("androidNativeX86")
-        target("androidNativeX64")
-        target("mingwX64")
-
-        common("darwin") {
-            // Tier 1
-            target("macosX64")
-            target("macosArm64")
-            target("iosSimulatorArm64")
-            target("iosX64")
-
-            // Tier 2
-            target("watchosSimulatorArm64")
-            target("watchosX64")
-            target("watchosArm32")
-            target("watchosArm64")
-            target("tvosSimulatorArm64")
-            target("tvosX64")
-            target("tvosArm64")
-            target("iosArm64")
-
-            // Tier 3
-            target("watchosDeviceArm64")
-        }
-    }
+    // Tier 3
+    androidNativeArm32()
+    androidNativeArm64()
+    androidNativeX86()
+    androidNativeX64()
+    mingwX64()
+    watchosDeviceArm64()
 
     jvm()
     js("jsIr", IR) { nodejs() }
     wasm("wasmJs") { d8() }
 
+    applyDefaultHierarchyTemplate()
+
     targets.configureEach {
         compilations.configureEach {
             kotlinOptions.freeCompilerArgs += "-Xexpect-actual-classes"