diff --git a/core-api/build.gradle.kts b/core-api/build.gradle.kts
index 1bffdd2d4..f90d00069 100644
--- a/core-api/build.gradle.kts
+++ b/core-api/build.gradle.kts
@@ -17,9 +17,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "core-api"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/core-appearance/build.gradle.kts b/core-appearance/build.gradle.kts
index cbfaa202d..e311efd1e 100644
--- a/core-appearance/build.gradle.kts
+++ b/core-appearance/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "core-appearance"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/core-architecture/build.gradle.kts b/core-architecture/build.gradle.kts
index de3868b7c..5ca1350dc 100644
--- a/core-architecture/build.gradle.kts
+++ b/core-architecture/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "core-architecture"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/core-commonui/build.gradle.kts b/core-commonui/build.gradle.kts
index 05abaa446..1822b53df 100644
--- a/core-commonui/build.gradle.kts
+++ b/core-commonui/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "core-commonui"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/core-md/build.gradle.kts b/core-md/build.gradle.kts
index 0c77ae829..3d8d15f09 100644
--- a/core-md/build.gradle.kts
+++ b/core-md/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "core-md"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/core-notifications/build.gradle.kts b/core-notifications/build.gradle.kts
index 17c2e963c..5c8d884fd 100644
--- a/core-notifications/build.gradle.kts
+++ b/core-notifications/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "core-notifications"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/core-preferences/build.gradle.kts b/core-preferences/build.gradle.kts
index 06e8b3137..2a5a597f3 100644
--- a/core-preferences/build.gradle.kts
+++ b/core-preferences/build.gradle.kts
@@ -14,9 +14,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "core-preferences"
+        }
+    }
 
     sourceSets {
         val androidMain by getting {
diff --git a/core-utils/build.gradle.kts b/core-utils/build.gradle.kts
index e18d5256a..1f41be6f2 100644
--- a/core-utils/build.gradle.kts
+++ b/core-utils/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "core-utils"
+        }
+    }
 
     sourceSets {
         val androidMain by getting {
diff --git a/domain-identity/build.gradle.kts b/domain-identity/build.gradle.kts
index 7cb7cbb52..9238dbf51 100644
--- a/domain-identity/build.gradle.kts
+++ b/domain-identity/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "domain-identity"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/domain-lemmy/build.gradle.kts b/domain-lemmy/build.gradle.kts
index 27688ef2d..be0e17418 100644
--- a/domain-lemmy/build.gradle.kts
+++ b/domain-lemmy/build.gradle.kts
@@ -14,9 +14,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "domain-lemmy"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/domain-lemmy/data/build.gradle.kts b/domain-lemmy/data/build.gradle.kts
index ba7a4e8ba..f91b39f8d 100644
--- a/domain-lemmy/data/build.gradle.kts
+++ b/domain-lemmy/data/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "domain-lemmy.data"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/domain-lemmy/repository/build.gradle.kts b/domain-lemmy/repository/build.gradle.kts
index 59162c22a..d69e19b76 100644
--- a/domain-lemmy/repository/build.gradle.kts
+++ b/domain-lemmy/repository/build.gradle.kts
@@ -14,9 +14,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "domain-lemmy.repository"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/feature-home/build.gradle.kts b/feature-home/build.gradle.kts
index 121a44670..c82e49bf6 100644
--- a/feature-home/build.gradle.kts
+++ b/feature-home/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "feature-home"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/feature-inbox/build.gradle.kts b/feature-inbox/build.gradle.kts
index 89a0137af..58e4b65ee 100644
--- a/feature-inbox/build.gradle.kts
+++ b/feature-inbox/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "feature-inbox"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/feature-profile/build.gradle.kts b/feature-profile/build.gradle.kts
index 483e71410..91694e1d7 100644
--- a/feature-profile/build.gradle.kts
+++ b/feature-profile/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "feature-profile"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/feature-search/build.gradle.kts b/feature-search/build.gradle.kts
index 8cf997563..e1d3cdd98 100644
--- a/feature-search/build.gradle.kts
+++ b/feature-search/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "feature-search"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/feature-settings/build.gradle.kts b/feature-settings/build.gradle.kts
index b82a6ca27..08a0ef8dd 100644
--- a/feature-settings/build.gradle.kts
+++ b/feature-settings/build.gradle.kts
@@ -15,9 +15,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "feature-settings"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts
index 4c565c051..9adff47db 100644
--- a/resources/build.gradle.kts
+++ b/resources/build.gradle.kts
@@ -16,9 +16,15 @@ kotlin {
             }
         }
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "resources"
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index ea22d7eef..dfe5e034f 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 kotlin {
-    android {
+    androidTarget {
         compilations.all {
             kotlinOptions {
                 jvmTarget = "1.8"