diff --git a/feature/credentials/src/main/kotlin/de/davis/keygo/feature/credentials/di/annotation/PasskeyQualifier.kt b/feature/credentials/src/main/kotlin/de/davis/keygo/feature/credentials/di/annotation/PasskeyQualifier.kt
index f0a905d8f..984e58847 100644
--- a/feature/credentials/src/main/kotlin/de/davis/keygo/feature/credentials/di/annotation/PasskeyQualifier.kt
+++ b/feature/credentials/src/main/kotlin/de/davis/keygo/feature/credentials/di/annotation/PasskeyQualifier.kt
@@ -1,12 +1,12 @@
 package de.davis.keygo.feature.credentials.di.annotation
 
 import org.koin.core.annotation.Named
+import org.koin.core.qualifier.Qualifier
+import org.koin.core.qualifier.qualifier
 
 
 @Named
-internal annotation class PasskeyQualifier {
+@Retention(AnnotationRetention.BINARY)
+internal annotation class PasskeyQualifier
 
-    companion object {
-        const val NAMED_QUALIFIER = "PasskeyQualifier"
-    }
-}
\ No newline at end of file
+internal val PasskeyProviderQualifier: Qualifier = qualifier<PasskeyQualifier>()
diff --git a/feature/credentials/src/main/kotlin/de/davis/keygo/feature/credentials/presentation/KeyGoCredentialProviderService.kt b/feature/credentials/src/main/kotlin/de/davis/keygo/feature/credentials/presentation/KeyGoCredentialProviderService.kt
index 0e29fecd0..b90c10ed4 100644
--- a/feature/credentials/src/main/kotlin/de/davis/keygo/feature/credentials/presentation/KeyGoCredentialProviderService.kt
+++ b/feature/credentials/src/main/kotlin/de/davis/keygo/feature/credentials/presentation/KeyGoCredentialProviderService.kt
@@ -22,7 +22,7 @@ import androidx.credentials.provider.BeginGetCredentialResponse
 import androidx.credentials.provider.BeginGetPublicKeyCredentialOption
 import androidx.credentials.provider.CredentialProviderService
 import androidx.credentials.provider.ProviderClearCredentialStateRequest
-import de.davis.keygo.feature.credentials.di.annotation.PasskeyQualifier
+import de.davis.keygo.feature.credentials.di.annotation.PasskeyProviderQualifier
 import de.davis.keygo.feature.credentials.presentation.create.CredentialCreator
 import de.davis.keygo.feature.credentials.presentation.provide.CredentialProvider
 import kotlinx.coroutines.CoroutineExceptionHandler
@@ -30,14 +30,13 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
-import org.koin.core.qualifier.named
 
 @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
 internal class KeyGoCredentialProviderService : CredentialProviderService() {
 
     private val credentialCreator by inject<CredentialCreator>()
     private val passkeyProvider by inject<CredentialProvider<BeginGetPublicKeyCredentialOption>>(
-        named(PasskeyQualifier.NAMED_QUALIFIER)
+        PasskeyProviderQualifier
     )
 
     override fun onBeginCreateCredentialRequest(