diff --git a/firebase-storage/build.gradle.kts b/firebase-storage/build.gradle.kts
index dacfd1143..7bc2148c1 100644
--- a/firebase-storage/build.gradle.kts
+++ b/firebase-storage/build.gradle.kts
@@ -125,7 +125,7 @@ kotlin {
         getByName("commonMain") {
             dependencies {
                 api(project(":firebase-app"))
-                implementation(project(":firebase-common"))
+                api(project(":firebase-common"))
             }
         }
 
@@ -140,6 +140,10 @@ kotlin {
                 api(libs.google.firebase.storage)
             }
         }
+
+        getByName("jvmMain") {
+            kotlin.srcDir("src/androidMain/kotlin")
+        }
     }
 }
 
diff --git a/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt
index 41c906c45..f693c997d 100644
--- a/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt
+++ b/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -85,7 +85,7 @@ public actual class StorageReference(internal val android: com.google.firebase.s
         if (metadata != null) {
             android.putFile(file.uri, metadata.toStorageMetadata()).await().run {}
         } else {
-            android.putFile(file.uri).await().run {}
+            android.putFile(file.uri, FirebaseStorageMetadata().toStorageMetadata()).await().run {}
         }
     }
 
@@ -93,7 +93,7 @@ public actual class StorageReference(internal val android: com.google.firebase.s
         if (metadata != null) {
             android.putBytes(data.data, metadata.toStorageMetadata()).await().run {}
         } else {
-            android.putBytes(data.data).await().run {}
+            android.putBytes(data.data, FirebaseStorageMetadata().toStorageMetadata()).await().run {}
         }
     }
 
@@ -101,7 +101,7 @@ public actual class StorageReference(internal val android: com.google.firebase.s
         val android = if (metadata != null) {
             android.putFile(file.uri, metadata.toStorageMetadata())
         } else {
-            android.putFile(file.uri)
+            android.putFile(file.uri, FirebaseStorageMetadata().toStorageMetadata())
         }
 
         val flow = callbackFlow {
diff --git a/firebase-storage/src/jvmMain/kotlin/dev/gitlive/firebase/storage/storage.jvm.kt b/firebase-storage/src/jvmMain/kotlin/dev/gitlive/firebase/storage/storage.jvm.kt
deleted file mode 100644
index c3674a728..000000000
--- a/firebase-storage/src/jvmMain/kotlin/dev/gitlive/firebase/storage/storage.jvm.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package dev.gitlive.firebase.storage
-
-import dev.gitlive.firebase.Firebase
-import dev.gitlive.firebase.FirebaseApp
-import dev.gitlive.firebase.FirebaseException
-import kotlin.time.Duration
-
-/** Returns the [FirebaseStorage] instance of the default [FirebaseApp]. */
-public actual val Firebase.storage: FirebaseStorage
-    get() = TODO("Not yet implemented")
-
-public actual fun Firebase.storage(url: String): FirebaseStorage = TODO("Not yet implemented")
-
-/** Returns the [FirebaseStorage] instance of a given [FirebaseApp]. */
-public actual fun Firebase.storage(app: FirebaseApp): FirebaseStorage = TODO("Not yet implemented")
-
-public actual fun Firebase.storage(app: FirebaseApp, url: String): FirebaseStorage = TODO("Not yet implemented")
-
-public actual class FirebaseStorage {
-    public actual val maxOperationRetryTime: Duration
-        get() = TODO("Not yet implemented")
-    public actual val maxUploadRetryTime: Duration
-        get() = TODO("Not yet implemented")
-
-    public actual fun setMaxOperationRetryTime(maxOperationRetryTime: Duration) {
-    }
-
-    public actual fun setMaxUploadRetryTime(maxUploadRetryTime: Duration) {
-    }
-
-    public actual fun useEmulator(host: String, port: Int) {
-    }
-
-    public actual val reference: StorageReference
-        get() = TODO("Not yet implemented")
-
-    public actual fun reference(location: String): StorageReference {
-        TODO("Not yet implemented")
-    }
-
-    public actual fun getReferenceFromUrl(fullUrl: String): StorageReference {
-        TODO("Not yet implemented")
-    }
-}
-
-public actual class StorageReference {
-    public actual val name: String
-        get() = TODO("Not yet implemented")
-    public actual val path: String
-        get() = TODO("Not yet implemented")
-    public actual val bucket: String
-        get() = TODO("Not yet implemented")
-    public actual val parent: StorageReference?
-        get() = TODO("Not yet implemented")
-    public actual val root: StorageReference
-        get() = TODO("Not yet implemented")
-    public actual val storage: FirebaseStorage
-        get() = TODO("Not yet implemented")
-
-    public actual suspend fun getMetadata(): FirebaseStorageMetadata? {
-        TODO("Not yet implemented")
-    }
-
-    public actual fun child(path: String): StorageReference {
-        TODO("Not yet implemented")
-    }
-
-    public actual suspend fun delete() {
-    }
-
-    public actual suspend fun getDownloadUrl(): String {
-        TODO("Not yet implemented")
-    }
-
-    public actual suspend fun listAll(): ListResult {
-        TODO("Not yet implemented")
-    }
-
-    public actual fun putFileResumable(file: File, metadata: FirebaseStorageMetadata?): ProgressFlow {
-        TODO("Not yet implemented")
-    }
-
-    public actual suspend fun putFile(file: File, metadata: FirebaseStorageMetadata?) {
-    }
-
-    public actual suspend fun putData(data: Data, metadata: FirebaseStorageMetadata?) {
-    }
-}
-
-public actual class ListResult {
-    public actual val prefixes: List<StorageReference>
-        get() = TODO("Not yet implemented")
-    public actual val items: List<StorageReference>
-        get() = TODO("Not yet implemented")
-    public actual val pageToken: String?
-        get() = TODO("Not yet implemented")
-}
-
-public actual class File
-public actual class FirebaseStorageException internal constructor(message: String) : FirebaseException(message)
-public actual class Data