diff --git a/generic-datastore-preferences/build.gradle.kts b/generic-datastore-preferences/build.gradle.kts
index 7967936..b4e7a55 100644
--- a/generic-datastore-preferences/build.gradle.kts
+++ b/generic-datastore-preferences/build.gradle.kts
@@ -19,12 +19,23 @@ kotlin {
         commonMain.dependencies {
             api(project(":generic-datastore-core"))
             implementation(libs.coroutines.core)
-            api(libs.datastore.preferences.core)
-            api(libs.datastore.core)
+            compileOnly(libs.datastore.preferences.core)
             api(libs.okio)
             implementation(libs.kotlinx.io.core)
             implementation(libs.kotlinx.serialization.json)
         }
+
+        androidMain.dependencies {
+            api(libs.datastore.preferences)
+        }
+
+        jvmMain.dependencies {
+            api(libs.datastore.preferences.core)
+        }
+
+        iosMain.dependencies {
+            api(libs.datastore.preferences.core)
+        }
     }
 }
 
diff --git a/generic-datastore-proto/build.gradle.kts b/generic-datastore-proto/build.gradle.kts
index 58f88a8..d1d327d 100644
--- a/generic-datastore-proto/build.gradle.kts
+++ b/generic-datastore-proto/build.gradle.kts
@@ -19,12 +19,24 @@ kotlin {
         commonMain.dependencies {
             api(project(":generic-datastore-core"))
             implementation(libs.coroutines.core)
-            api(libs.datastore.core)
+            compileOnly(libs.datastore.core)
             api(libs.datastore.core.okio)
             api(libs.okio)
             implementation(libs.kotlinx.io.core)
             implementation(libs.kotlinx.serialization.json)
         }
+
+        androidMain.dependencies {
+            api(libs.datastore.android.core)
+        }
+
+        jvmMain.dependencies {
+            api(libs.datastore.core)
+        }
+
+        iosMain.dependencies {
+            api(libs.datastore.core)
+        }
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 79b8c59..cb3f91c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -63,7 +63,10 @@ leak-canary = { module = "com.squareup.leakcanary:leakcanary-android", version.r
 
 datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
 datastore-preferences-core = { module = "androidx.datastore:datastore-preferences-core", version.ref = "datastore" }
+
+datastore-android-core = { module = "androidx.datastore:datastore", version.ref = "datastore" }
 datastore-core = { module = "androidx.datastore:datastore-core", version.ref = "datastore" }
+
 datastore-core-okio = { module = "androidx.datastore:datastore-core-okio", version.ref = "datastore" }
 kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io" }
 okio = { module = "com.squareup.okio:okio", version.ref = "okio" }