diff --git a/app/src/main/java/com/tangem/tap/network/auth/DefaultExpressAuthProvider.kt b/app/src/main/java/com/tangem/tap/network/auth/DefaultExpressAuthProvider.kt
index 47188c465b..89fd184cd1 100644
--- a/app/src/main/java/com/tangem/tap/network/auth/DefaultExpressAuthProvider.kt
+++ b/app/src/main/java/com/tangem/tap/network/auth/DefaultExpressAuthProvider.kt
@@ -1,6 +1,6 @@
 package com.tangem.tap.network.auth
 
-import com.tangem.lib.auth.ExpressAuthProvider
+import com.tangem.datasource.api.auth.ExpressAuthProvider
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicReference
 
diff --git a/app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt b/app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt
index 9ed1541c3e..e2f763ce2e 100644
--- a/app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt
+++ b/app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.network.auth
 
 import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.domain.staking.model.ethpool.P2PEthPoolStakingConfig
-import com.tangem.lib.auth.P2PEthPoolAuthProvider
+import com.tangem.datasource.api.auth.P2PEthPoolAuthProvider
 
 internal class DefaultP2PEthPoolAuthProvider(
     private val environmentConfig: EnvironmentConfig,
diff --git a/app/src/main/java/com/tangem/tap/network/auth/DefaultStakeKitAuthProvider.kt b/app/src/main/java/com/tangem/tap/network/auth/DefaultStakeKitAuthProvider.kt
index 079cad327a..d29b71b47f 100644
--- a/app/src/main/java/com/tangem/tap/network/auth/DefaultStakeKitAuthProvider.kt
+++ b/app/src/main/java/com/tangem/tap/network/auth/DefaultStakeKitAuthProvider.kt
@@ -1,7 +1,7 @@
 package com.tangem.tap.network.auth
 
 import com.tangem.datasource.local.config.environment.EnvironmentConfig
-import com.tangem.lib.auth.StakeKitAuthProvider
+import com.tangem.datasource.api.auth.StakeKitAuthProvider
 
 internal class DefaultStakeKitAuthProvider(
     private val environmentConfig: EnvironmentConfig,
diff --git a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
index 6313d30db9..571f64cf47 100644
--- a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
+++ b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
@@ -3,9 +3,9 @@ package com.tangem.tap.network.auth.di
 import com.tangem.datasource.api.common.AuthProvider
 import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.domain.common.wallets.UserWalletsListRepository
-import com.tangem.lib.auth.ExpressAuthProvider
-import com.tangem.lib.auth.P2PEthPoolAuthProvider
-import com.tangem.lib.auth.StakeKitAuthProvider
+import com.tangem.datasource.api.auth.ExpressAuthProvider
+import com.tangem.datasource.api.auth.P2PEthPoolAuthProvider
+import com.tangem.datasource.api.auth.StakeKitAuthProvider
 import com.tangem.tap.network.auth.*
 import dagger.Module
 import dagger.Provides
diff --git a/core/datasource/build.gradle.kts b/core/datasource/build.gradle.kts
index 028d38c5ec..16c61b4b29 100644
--- a/core/datasource/build.gradle.kts
+++ b/core/datasource/build.gradle.kts
@@ -69,7 +69,6 @@ dependencies {
     implementation(projects.core.analytics)
     implementation(projects.core.utils)
     implementation(projects.core.res)
-    implementation(projects.libs.auth)
     implementation(projects.domain.appTheme.models)
     implementation(projects.domain.core)
     implementation(projects.domain.tokens.models)
diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/ExpressAuthProvider.kt b/core/datasource/src/main/java/com/tangem/datasource/api/auth/ExpressAuthProvider.kt
similarity index 62%
rename from libs/auth/src/main/java/com/tangem/lib/auth/ExpressAuthProvider.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/auth/ExpressAuthProvider.kt
index fa5fc99d83..33d8d266ab 100644
--- a/libs/auth/src/main/java/com/tangem/lib/auth/ExpressAuthProvider.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/auth/ExpressAuthProvider.kt
@@ -1,4 +1,4 @@
-package com.tangem.lib.auth
+package com.tangem.datasource.api.auth
 
 interface ExpressAuthProvider {
     fun getSessionId(): String
diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/P2PEthPoolAuthProvider.kt b/core/datasource/src/main/java/com/tangem/datasource/api/auth/P2PEthPoolAuthProvider.kt
similarity index 62%
rename from libs/auth/src/main/java/com/tangem/lib/auth/P2PEthPoolAuthProvider.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/auth/P2PEthPoolAuthProvider.kt
index f95dc78e38..a9f5bdef48 100644
--- a/libs/auth/src/main/java/com/tangem/lib/auth/P2PEthPoolAuthProvider.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/auth/P2PEthPoolAuthProvider.kt
@@ -1,4 +1,4 @@
-package com.tangem.lib.auth
+package com.tangem.datasource.api.auth
 
 interface P2PEthPoolAuthProvider {
 
diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/StakeKitAuthProvider.kt b/core/datasource/src/main/java/com/tangem/datasource/api/auth/StakeKitAuthProvider.kt
similarity index 62%
rename from libs/auth/src/main/java/com/tangem/lib/auth/StakeKitAuthProvider.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/auth/StakeKitAuthProvider.kt
index d6f3fac532..b0bab7654d 100644
--- a/libs/auth/src/main/java/com/tangem/lib/auth/StakeKitAuthProvider.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/auth/StakeKitAuthProvider.kt
@@ -1,4 +1,4 @@
-package com.tangem.lib.auth
+package com.tangem.datasource.api.auth
 
 interface StakeKitAuthProvider {
 
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt
index b0c61cbfc6..b73409d740 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt
@@ -3,7 +3,7 @@ package com.tangem.datasource.api.common.config
 import com.tangem.datasource.BuildConfig
 import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.datasource.utils.RequestHeader
-import com.tangem.lib.auth.ExpressAuthProvider
+import com.tangem.datasource.api.auth.ExpressAuthProvider
 import com.tangem.utils.ProviderSuspend
 import com.tangem.utils.info.AppInfoProvider
 
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/P2PEthPool.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/P2PEthPool.kt
index 0dbc3bb4bb..1e29b8cad2 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/P2PEthPool.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/P2PEthPool.kt
@@ -2,7 +2,7 @@ package com.tangem.datasource.api.common.config
 
 import com.tangem.datasource.BuildConfig
 import com.tangem.domain.staking.model.ethpool.P2PEthPoolStakingConfig
-import com.tangem.lib.auth.P2PEthPoolAuthProvider
+import com.tangem.datasource.api.auth.P2PEthPoolAuthProvider
 import com.tangem.utils.ProviderSuspend
 
 /**
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/StakeKit.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/StakeKit.kt
index 8f0331ca8b..636cfb2b05 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/StakeKit.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/StakeKit.kt
@@ -1,7 +1,7 @@
 package com.tangem.datasource.api.common.config
 
 import com.tangem.datasource.BuildConfig
-import com.tangem.lib.auth.StakeKitAuthProvider
+import com.tangem.datasource.api.auth.StakeKitAuthProvider
 import com.tangem.utils.ProviderSuspend
 
 /**
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt
index d6e55b6589..1ed7b48d48 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt
@@ -3,9 +3,9 @@ package com.tangem.datasource.di
 import com.tangem.datasource.api.common.AuthProvider
 import com.tangem.datasource.api.common.config.*
 import com.tangem.datasource.local.config.environment.EnvironmentConfig
-import com.tangem.lib.auth.ExpressAuthProvider
-import com.tangem.lib.auth.P2PEthPoolAuthProvider
-import com.tangem.lib.auth.StakeKitAuthProvider
+import com.tangem.datasource.api.auth.ExpressAuthProvider
+import com.tangem.datasource.api.auth.P2PEthPoolAuthProvider
+import com.tangem.datasource.api.auth.StakeKitAuthProvider
 import com.tangem.utils.info.AppInfoProvider
 import dagger.Module
 import dagger.Provides
diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
index 2dca2bbfaf..3ef468d8db 100644
--- a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
+++ b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
@@ -13,9 +13,9 @@ import com.tangem.datasource.api.common.config.ApiConfig.Companion.RELEASE_BUILD
 import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.datasource.local.config.environment.models.ExpressModel
 import com.tangem.domain.staking.model.ethpool.P2PEthPoolStakingConfig
-import com.tangem.lib.auth.ExpressAuthProvider
-import com.tangem.lib.auth.P2PEthPoolAuthProvider
-import com.tangem.lib.auth.StakeKitAuthProvider
+import com.tangem.datasource.api.auth.ExpressAuthProvider
+import com.tangem.datasource.api.auth.P2PEthPoolAuthProvider
+import com.tangem.datasource.api.auth.StakeKitAuthProvider
 import com.tangem.test.core.ProvideTestModels
 import com.tangem.utils.ProviderSuspend
 import com.tangem.utils.info.AppInfoProvider