diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
index 9b9a14b0699..830077a1e6d 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
@@ -212,13 +212,14 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
                 add("legacy_memory_manager.bc")
             }
             MemoryModel.EXPERIMENTAL -> {
-                add("common_gc.bc")
                 when (gc) {
                     GC.SAME_THREAD_MARK_AND_SWEEP -> {
+                        add("common_gc_stms.bc")
                         add("experimental_memory_manager_stms.bc")
                         add("same_thread_ms_gc.bc")
                     }
                     GC.NOOP -> {
+                        add("common_gc_noop.bc")
                         add("experimental_memory_manager_noop.bc")
                         add("noop_gc.bc")
                     }
diff --git a/kotlin-native/runtime/build.gradle.kts b/kotlin-native/runtime/build.gradle.kts
index e4c65ec05da..af2f1c2a394 100644
--- a/kotlin-native/runtime/build.gradle.kts
+++ b/kotlin-native/runtime/build.gradle.kts
@@ -45,7 +45,8 @@ bitcode {
             "${target}LegacyMemoryManager",
             "${target}ExperimentalMemoryManagerNoop",
             "${target}ExperimentalMemoryManagerStms",
-            "${target}CommonGc",
+            "${target}CommonGcNoop",
+            "${target}CommonGcStms",
             "${target}SameThreadMsGc",
             "${target}NoopGc"
         )
@@ -162,8 +163,13 @@ bitcode {
         includeRuntime()
     }
 
-    create("common_gc", file("src/gc/common")) {
-        headersDirs += files("src/mm/cpp")
+    create("common_gc_noop", file("src/gc/common")) {
+        headersDirs += files("src/gc/noop/cpp", "src/mm/cpp")
+        includeRuntime()
+    }
+
+    create("common_gc_stms", file("src/gc/common")) {
+        headersDirs += files("src/gc/stms/cpp", "src/mm/cpp")
         includeRuntime()
     }
 
@@ -219,7 +225,7 @@ targetList.forEach { targetName ->
             listOf(
                 "${targetName}Runtime",
                 "${targetName}ExperimentalMemoryManagerStms",
-                "${targetName}CommonGc",
+                "${targetName}CommonGcStms",
                 "${targetName}SameThreadMsGc",
                 "${targetName}Mimalloc",
                 "${targetName}OptAlloc",
@@ -237,7 +243,7 @@ targetList.forEach { targetName ->
             listOf(
                 "${targetName}Runtime",
                 "${targetName}ExperimentalMemoryManagerStms",
-                "${targetName}CommonGc",
+                "${targetName}CommonGcStms",
                 "${targetName}SameThreadMsGc",
                 "${targetName}StdAlloc",
                 "${targetName}Objc"
@@ -254,7 +260,7 @@ targetList.forEach { targetName ->
             listOf(
                 "${targetName}Runtime",
                 "${targetName}ExperimentalMemoryManagerNoop",
-                "${targetName}CommonGc",
+                "${targetName}CommonGcNoop",
                 "${targetName}NoopGc",
                 "${targetName}Mimalloc",
                 "${targetName}OptAlloc",
@@ -272,7 +278,7 @@ targetList.forEach { targetName ->
             listOf(
                 "${targetName}Runtime",
                 "${targetName}ExperimentalMemoryManagerNoop",
-                "${targetName}CommonGc",
+                "${targetName}CommonGcNoop",
                 "${targetName}NoopGc",
                 "${targetName}StdAlloc",
                 "${targetName}Objc"