diff --git a/push-message-provider-fcm/src/main/kotlin/ru/touchin/push/message/provider/fcm/configurations/PushMessageProviderFcmConfiguration.kt b/push-message-provider-fcm/src/main/kotlin/ru/touchin/push/message/provider/fcm/configurations/PushMessageProviderFcmConfiguration.kt
index b73da71..63fe002 100644
--- a/push-message-provider-fcm/src/main/kotlin/ru/touchin/push/message/provider/fcm/configurations/PushMessageProviderFcmConfiguration.kt
+++ b/push-message-provider-fcm/src/main/kotlin/ru/touchin/push/message/provider/fcm/configurations/PushMessageProviderFcmConfiguration.kt
@@ -25,6 +25,7 @@ class PushMessageProviderFcmConfiguration {
     @Bean
     fun firebaseMessaging(
         properties: PushMessageProviderFcmProperties,
+        @Qualifier("push-message-provider.fcm.credentials-object-mapper")
         objectMapper: ObjectMapper
     ): FirebaseMessaging {
         val credentials = when {
@@ -60,8 +61,7 @@ class PushMessageProviderFcmConfiguration {
         return FirebaseMessaging.getInstance(firebaseApp)
     }
 
-    @Bean
-    @Qualifier("push-message-provider.fcm.auth")
+    @Bean("push-message-provider.fcm.auth")
     fun simpleDateFormat(): SimpleDateFormat {
         return SimpleDateFormat("yyyy-MM-dd HH:mm:ss X", Locale.getDefault())
     }
diff --git a/push-message-provider-fcm/src/test/kotlin/ru/touchin/push/message/provider/fcm/PushMessageProviderFcmTestApplication.kt b/push-message-provider-fcm/src/test/kotlin/ru/touchin/push/message/provider/fcm/PushMessageProviderFcmTestApplication.kt
index 055a72d..1745c9b 100644
--- a/push-message-provider-fcm/src/test/kotlin/ru/touchin/push/message/provider/fcm/PushMessageProviderFcmTestApplication.kt
+++ b/push-message-provider-fcm/src/test/kotlin/ru/touchin/push/message/provider/fcm/PushMessageProviderFcmTestApplication.kt
@@ -18,7 +18,7 @@ import java.text.SimpleDateFormat
 @EnablePushMessageProviderFcm
 class PushMessageProviderFcmTestApplication : ApplicationListener<ContextRefreshedEvent> {
 
-    @Bean
+    @Bean("push-message-provider.fcm.credentials-object-mapper")
     fun objectMapper(
         @Qualifier("push-message-provider.fcm.auth")
         simpleDateFormat: SimpleDateFormat
diff --git a/push-message-provider-hpk/src/main/kotlin/ru/touchin/push/message/provider/hpk/configurations/PushMessageProviderHpkConfiguration.kt b/push-message-provider-hpk/src/main/kotlin/ru/touchin/push/message/provider/hpk/configurations/PushMessageProviderHpkConfiguration.kt
index f5a5567..4701228 100644
--- a/push-message-provider-hpk/src/main/kotlin/ru/touchin/push/message/provider/hpk/configurations/PushMessageProviderHpkConfiguration.kt
+++ b/push-message-provider-hpk/src/main/kotlin/ru/touchin/push/message/provider/hpk/configurations/PushMessageProviderHpkConfiguration.kt
@@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan
 import org.springframework.cache.CacheManager
@@ -23,8 +22,7 @@ import ru.touchin.push.message.provider.hpk.services.HmsOauthAccessTokenCacheSer
 @Import(value = [PushMessageProviderConfiguration::class])
 class PushMessageProviderHpkConfiguration {
 
-    @Bean
-    @Qualifier("push-message-provider.hpk.webclient-objectmapper")
+    @Bean("push-message-provider.hpk.webclient-objectmapper")
     fun webclientObjectMapper(): ObjectMapper {
         return jacksonObjectMapper()
             .registerModule(JavaTimeModule())
@@ -34,8 +32,7 @@ class PushMessageProviderHpkConfiguration {
             .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
     }
 
-    @Bean
-    @Qualifier("push-message-provider.hpk.client-objectmapper")
+    @Bean("push-message-provider.hpk.client-objectmapper")
     fun clientObjectMapper(): ObjectMapper {
         return jacksonObjectMapper()
             .registerModule(JavaTimeModule())
@@ -43,9 +40,8 @@ class PushMessageProviderHpkConfiguration {
             .setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
     }
 
-    @Bean
+    @Bean("push-message-provider.hpk.webclient-cachemanager")
     @ConditionalOnMissingBean
-    @Qualifier("push-message-provider.hpk.webclient-cachemanager")
     fun cacheManager(): CacheManager {
         return SimpleCacheManager().also {
             it.setCaches(