diff --git a/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.android.kt b/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.android.kt
index 0485366..e6e689a 100644
--- a/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.android.kt
+++ b/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.android.kt
@@ -5,9 +5,11 @@ import fr.ajaury.gwenedeg.player.data.AndroidAudioSessionManager
 import fr.ajaury.gwenedeg.player.domain.AudioPlayer
 import fr.ajaury.gwenedeg.player.domain.AudioSessionManager
 import org.koin.core.module.Module
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 actual val audioPlayerModule: Module = module {
-    single<AudioPlayer> { AndroidAudioPlayer(context = get()) }
-    single<AudioSessionManager> { AndroidAudioSessionManager() }
+    singleOf(::AndroidAudioPlayer) { bind<AudioPlayer>() }
+    singleOf(::AndroidAudioSessionManager) { bind<AudioSessionManager>() }
 }
diff --git a/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.ios.kt b/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.ios.kt
index a642412..a45df3a 100644
--- a/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.ios.kt
+++ b/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.ios.kt
@@ -1,13 +1,17 @@
 package fr.ajaury.gwenedeg.player.di
 
+import fr.ajaury.gwenedeg.core.logging.di.loggingModule
 import fr.ajaury.gwenedeg.player.data.IosAudioPlayer
 import fr.ajaury.gwenedeg.player.data.IosAudioSessionManager
 import fr.ajaury.gwenedeg.player.domain.AudioPlayer
 import fr.ajaury.gwenedeg.player.domain.AudioSessionManager
 import org.koin.core.module.Module
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 actual val audioPlayerModule: Module = module {
-    single<AudioPlayer> { IosAudioPlayer() }
-    single<AudioSessionManager> { IosAudioSessionManager() }
+    includes(loggingModule)
+    singleOf(::IosAudioPlayer) { bind<AudioPlayer>() }
+    singleOf(::IosAudioSessionManager) { bind<AudioSessionManager>() }
 }
diff --git a/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.jvm.kt b/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.jvm.kt
index ce5ec50..83e8523 100644
--- a/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.jvm.kt
+++ b/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.jvm.kt
@@ -5,9 +5,11 @@ import fr.ajaury.gwenedeg.player.data.JvmAudioSessionManager
 import fr.ajaury.gwenedeg.player.domain.AudioPlayer
 import fr.ajaury.gwenedeg.player.domain.AudioSessionManager
 import org.koin.core.module.Module
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 actual val audioPlayerModule: Module = module {
-    single<AudioPlayer> { JvmAudioPlayer() }
-    single<AudioSessionManager> { JvmAudioSessionManager() }
+    singleOf(::JvmAudioPlayer) { bind<AudioPlayer>() }
+    singleOf(::JvmAudioSessionManager) { bind<AudioSessionManager>() }
 }
diff --git a/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.web.kt b/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.web.kt
index d932a8e..ddc2d5a 100644
--- a/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.web.kt
+++ b/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.web.kt
@@ -5,9 +5,11 @@ import fr.ajaury.gwenedeg.player.data.WebAudioSessionManager
 import fr.ajaury.gwenedeg.player.domain.AudioPlayer
 import fr.ajaury.gwenedeg.player.domain.AudioSessionManager
 import org.koin.core.module.Module
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 actual val audioPlayerModule: Module = module {
-    single<AudioPlayer> { WebAudioPlayer() }
-    single<AudioSessionManager> { WebAudioSessionManager() }
+    singleOf(::WebAudioPlayer) { bind<AudioPlayer>() }
+    singleOf(::WebAudioSessionManager) { bind<AudioSessionManager>() }
 }
diff --git a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/di/CoroutinesModule.kt b/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/di/CoroutinesModule.kt
index 65ec3f3..5f7a4a2 100644
--- a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/di/CoroutinesModule.kt
+++ b/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/di/CoroutinesModule.kt
@@ -3,8 +3,10 @@ package fr.ajaury.gwenedeg.core.coroutines.di
 import fr.ajaury.gwenedeg.core.coroutines.data.DefaultDispatcherProvider
 import fr.ajaury.gwenedeg.core.coroutines.domain.DispatcherProvider
 import org.koin.core.module.Module
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val coroutinesModule: Module = module {
-    single<DispatcherProvider> { DefaultDispatcherProvider() }
+    singleOf(::DefaultDispatcherProvider) { bind<DispatcherProvider>() }
 }
diff --git a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt b/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt
index 6aa37ca..51e16ec 100644
--- a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt
+++ b/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt
@@ -2,9 +2,9 @@ package fr.ajaury.gwenedeg.core.logging.data
 
 import fr.ajaury.gwenedeg.core.logging.domain.Logger
 
-internal class KermitLogger(
-    private val tag: String = "Gwenedeg",
-) : Logger {
+internal class KermitLogger : Logger {
+    private val tag: String = "Gwenedeg"
+
     override fun debug(
         message: String,
         throwable: Throwable?,
diff --git a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/di/LoggingModule.kt b/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/di/LoggingModule.kt
index b5edac8..005f757 100644
--- a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/di/LoggingModule.kt
+++ b/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/di/LoggingModule.kt
@@ -3,8 +3,10 @@ package fr.ajaury.gwenedeg.core.logging.di
 import fr.ajaury.gwenedeg.core.logging.data.KermitLogger
 import fr.ajaury.gwenedeg.core.logging.domain.Logger
 import org.koin.core.module.Module
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val loggingModule: Module = module {
-    single<Logger> { KermitLogger() }
+    singleOf(::KermitLogger) { bind<Logger>() }
 }
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt
index edfc8ee..32c1b22 100644
--- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt
@@ -1,5 +1,6 @@
 package fr.ajaury.gwenedeg.di
 
+import fr.ajaury.gwenedeg.core.logging.di.loggingModule
 import fr.ajaury.gwenedeg.player.ui.viewmodel.PlayerViewModel
 import fr.ajaury.gwenedeg.records.data.InMemoryRecordRepository
 import fr.ajaury.gwenedeg.records.domain.RecordRepository
@@ -12,6 +13,7 @@ import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 val sharedModule = module {
+    includes(loggingModule)
     factoryOf(::InMemoryRecordRepository) { bind<RecordRepository>() }
     viewModelOf(::RecordsViewModel)
     viewModelOf(::PlayerViewModel)