diff --git a/account-manager/data/api/account-manager-data.api b/account-manager/data/api/account-manager-data.api
index 6dd22a2ba..8131d4c2b 100644
--- a/account-manager/data/api/account-manager-data.api
+++ b/account-manager/data/api/account-manager-data.api
@@ -43,18 +43,6 @@ public final class me/proton/core/accountmanager/data/BuildConfig {
 	public fun <init> ()V
 }
 
-public final class me/proton/core/accountmanager/data/LogTag {
-	public static final field DEFAULT Ljava/lang/String;
-	public static final field INSTANCE Lme/proton/core/accountmanager/data/LogTag;
-	public static final field INVALID_USER_ADDRESS_KEY Ljava/lang/String;
-	public static final field INVALID_USER_KEY Ljava/lang/String;
-	public final fun getSESSION_CREATE-WnFgrgw ()Ljava/lang/String;
-	public final fun getSESSION_FORCE_LOGOUT-WnFgrgw ()Ljava/lang/String;
-	public final fun getSESSION_REFRESH-WnFgrgw ()Ljava/lang/String;
-	public final fun getSESSION_REQUEST-WnFgrgw ()Ljava/lang/String;
-	public final fun getSESSION_SCOPES-WnFgrgw ()Ljava/lang/String;
-}
-
 public class me/proton/core/accountmanager/data/SessionListenerImpl : me/proton/core/network/domain/session/SessionListener {
 	public fun <init> (Ldagger/Lazy;)V
 	public fun onSessionForceLogout (Lme/proton/core/network/domain/session/Session;ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/AccountStateHandler.kt b/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/AccountStateHandler.kt
index a184e9808..74ace3647 100644
--- a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/AccountStateHandler.kt
+++ b/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/AccountStateHandler.kt
@@ -25,6 +25,7 @@ import me.proton.core.accountmanager.data.job.onInvalidUserAddressKey
 import me.proton.core.accountmanager.data.job.onInvalidUserKey
 import me.proton.core.accountmanager.data.job.onMigrationNeeded
 import me.proton.core.accountmanager.domain.AccountManager
+import me.proton.core.accountmanager.domain.LogTag
 import me.proton.core.accountmanager.domain.migrator.AccountMigrator
 import me.proton.core.accountrecovery.presentation.compose.AccountRecoveryNotificationSetup
 import me.proton.core.domain.entity.Product
diff --git a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionListenerImpl.kt b/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionListenerImpl.kt
index 2715a8f5d..891a32f9e 100644
--- a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionListenerImpl.kt
+++ b/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionListenerImpl.kt
@@ -18,10 +18,10 @@
 
 package me.proton.core.accountmanager.data
 
-import me.proton.core.accountmanager.data.LogTag.SESSION_CREATE
-import me.proton.core.accountmanager.data.LogTag.SESSION_FORCE_LOGOUT
-import me.proton.core.accountmanager.data.LogTag.SESSION_REFRESH
-import me.proton.core.accountmanager.data.LogTag.SESSION_SCOPES
+import me.proton.core.accountmanager.domain.LogTag.SESSION_CREATE
+import me.proton.core.accountmanager.domain.LogTag.SESSION_FORCE_LOGOUT
+import me.proton.core.accountmanager.domain.LogTag.SESSION_REFRESH
+import me.proton.core.accountmanager.domain.LogTag.SESSION_SCOPES
 import me.proton.core.accountmanager.domain.SessionManager
 import me.proton.core.domain.entity.UserId
 import me.proton.core.network.domain.session.Session
diff --git a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionManagerImpl.kt b/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionManagerImpl.kt
index 920089203..f9f6eaed3 100644
--- a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionManagerImpl.kt
+++ b/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionManagerImpl.kt
@@ -23,6 +23,7 @@ import kotlinx.coroutines.sync.withLock
 import me.proton.core.account.domain.entity.AccountState
 import me.proton.core.account.domain.entity.SessionState
 import me.proton.core.account.domain.repository.AccountRepository
+import me.proton.core.accountmanager.domain.LogTag
 import me.proton.core.accountmanager.domain.SessionManager
 import me.proton.core.auth.domain.repository.AuthRepository
 import me.proton.core.domain.entity.UserId
diff --git a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/job/OnInvalidKey.kt b/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/job/OnInvalidKey.kt
index fc5b7ccef..2416cccb2 100644
--- a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/job/OnInvalidKey.kt
+++ b/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/job/OnInvalidKey.kt
@@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import me.proton.core.account.domain.entity.AccountState
 import me.proton.core.accountmanager.data.AccountStateHandler
-import me.proton.core.accountmanager.data.LogTag
+import me.proton.core.accountmanager.domain.LogTag
 import me.proton.core.accountmanager.domain.getAccounts
 import me.proton.core.domain.entity.UserId
 import me.proton.core.key.domain.extension.areAllInactive
diff --git a/account-manager/domain/api/account-manager-domain.api b/account-manager/domain/api/account-manager-domain.api
index 2c0741a39..78e27ac56 100644
--- a/account-manager/domain/api/account-manager-domain.api
+++ b/account-manager/domain/api/account-manager-domain.api
@@ -25,6 +25,18 @@ public final class me/proton/core/accountmanager/domain/AccountManagerExtensions
 	public static synthetic fun onSessionState$default (Lme/proton/core/accountmanager/domain/AccountManager;[Lme/proton/core/account/domain/entity/SessionState;ZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 }
 
+public final class me/proton/core/accountmanager/domain/LogTag {
+	public static final field DEFAULT Ljava/lang/String;
+	public static final field INSTANCE Lme/proton/core/accountmanager/domain/LogTag;
+	public static final field INVALID_USER_ADDRESS_KEY Ljava/lang/String;
+	public static final field INVALID_USER_KEY Ljava/lang/String;
+	public final fun getSESSION_CREATE-WnFgrgw ()Ljava/lang/String;
+	public final fun getSESSION_FORCE_LOGOUT-WnFgrgw ()Ljava/lang/String;
+	public final fun getSESSION_REFRESH-WnFgrgw ()Ljava/lang/String;
+	public final fun getSESSION_REQUEST-WnFgrgw ()Ljava/lang/String;
+	public final fun getSESSION_SCOPES-WnFgrgw ()Ljava/lang/String;
+}
+
 public abstract interface class me/proton/core/accountmanager/domain/SessionManager : me/proton/core/network/domain/session/SessionProvider {
 	public abstract fun refreshScopes (Lme/proton/core/network/domain/session/SessionId;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun refreshSession (Lme/proton/core/network/domain/session/Session;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/LogTag.kt b/account-manager/domain/src/main/kotlin/me/proton/core/accountmanager/domain/LogTag.kt
similarity index 95%
rename from account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/LogTag.kt
rename to account-manager/domain/src/main/kotlin/me/proton/core/accountmanager/domain/LogTag.kt
index 82752c636..1b7450f17 100644
--- a/account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/LogTag.kt
+++ b/account-manager/domain/src/main/kotlin/me/proton/core/accountmanager/domain/LogTag.kt
@@ -1,4 +1,4 @@
-package me.proton.core.accountmanager.data
+package me.proton.core.accountmanager.domain
 
 import me.proton.core.util.kotlin.LoggerLogTag
 
diff --git a/coreexample/build.gradle.kts b/coreexample/build.gradle.kts
index de0ffaf2d..59875a600 100644
--- a/coreexample/build.gradle.kts
+++ b/coreexample/build.gradle.kts
@@ -259,6 +259,7 @@ dependencies {
         `room-ktx`,
         retrofit,
         timber,
+        `sentry-android-core`,
         `ez-vcard`
     )
 
diff --git a/coreexample/src/main/kotlin/me/proton/android/core/coreexample/CoreExampleLogger.kt b/coreexample/src/main/kotlin/me/proton/android/core/coreexample/CoreExampleLogger.kt
index 2d9010c1a..0d0c04836 100644
--- a/coreexample/src/main/kotlin/me/proton/android/core/coreexample/CoreExampleLogger.kt
+++ b/coreexample/src/main/kotlin/me/proton/android/core/coreexample/CoreExampleLogger.kt
@@ -18,6 +18,7 @@
 
 package me.proton.android.core.coreexample
 
+import me.proton.core.network.domain.LogTag
 import me.proton.core.util.kotlin.Logger
 import me.proton.core.util.kotlin.LoggerLogTag
 import org.jetbrains.annotations.NonNls
@@ -50,10 +51,10 @@ class CoreExampleLogger : Logger {
         Timber.tag(tag).v(e, message)
 
     override fun log(tag: LoggerLogTag, message: String) = when (tag) {
-        me.proton.core.network.data.LogTag.API_REQUEST -> Timber.tag(tag.name).i("--> $message")
-        me.proton.core.network.data.LogTag.API_RESPONSE -> Timber.tag(tag.name).i("<-- $message")
-        me.proton.core.network.data.LogTag.API_ERROR -> Timber.tag(tag.name).w("--x $message")
-        me.proton.core.network.data.LogTag.SERVER_TIME_PARSE_ERROR -> Timber.tag(tag.name).e(message)
+        LogTag.API_REQUEST -> Timber.tag(tag.name).i("--> $message")
+        LogTag.API_RESPONSE -> Timber.tag(tag.name).i("<-- $message")
+        LogTag.API_ERROR -> Timber.tag(tag.name).w("--x $message")
+        LogTag.SERVER_TIME_PARSE_ERROR -> Timber.tag(tag.name).e(message)
         else -> Timber.tag(tag.name).d(message)
     }
 }
diff --git a/event-manager/data/api/event-manager-data.api b/event-manager/data/api/event-manager-data.api
index 796d5e468..30ccd982a 100644
--- a/event-manager/data/api/event-manager-data.api
+++ b/event-manager/data/api/event-manager-data.api
@@ -87,15 +87,6 @@ public final class me/proton/core/eventmanager/data/EventManagerProviderImpl : m
 	public fun getAll (Lme/proton/core/domain/entity/UserId;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class me/proton/core/eventmanager/data/LogTag {
-	public static final field COLLECT_ERROR Ljava/lang/String;
-	public static final field FETCH_ERROR Ljava/lang/String;
-	public static final field INSTANCE Lme/proton/core/eventmanager/data/LogTag;
-	public static final field NOTIFY_ERROR Ljava/lang/String;
-	public static final field WORKER_ERROR Ljava/lang/String;
-	public final fun getREPORT_MAX_RETRY-WnFgrgw ()Ljava/lang/String;
-}
-
 public abstract interface class me/proton/core/eventmanager/data/api/EventApi : me/proton/core/network/data/protonApi/BaseRetrofitApi {
 	public abstract fun getEvents (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun getLatestEventId (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/EventManagerImpl.kt b/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/EventManagerImpl.kt
index 7315fd458..c900c2048 100644
--- a/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/EventManagerImpl.kt
+++ b/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/EventManagerImpl.kt
@@ -40,6 +40,7 @@ import me.proton.core.eventmanager.data.extension.runInTransaction
 import me.proton.core.eventmanager.domain.EventListener
 import me.proton.core.eventmanager.domain.EventManager
 import me.proton.core.eventmanager.domain.EventManagerConfig
+import me.proton.core.eventmanager.domain.LogTag
 import me.proton.core.eventmanager.domain.entity.EventId
 import me.proton.core.eventmanager.domain.entity.EventMetadata
 import me.proton.core.eventmanager.domain.entity.EventsResponse
diff --git a/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/work/EventWorker.kt b/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/work/EventWorker.kt
index 0caa858ed..ac3b04dba 100644
--- a/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/work/EventWorker.kt
+++ b/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/work/EventWorker.kt
@@ -30,7 +30,7 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import me.proton.core.eventmanager.data.LogTag
+import me.proton.core.eventmanager.domain.LogTag
 import me.proton.core.eventmanager.domain.EventManagerConfig
 import me.proton.core.eventmanager.domain.EventManagerProvider
 import me.proton.core.eventmanager.domain.work.EventWorkerManager
diff --git a/event-manager/domain/api/event-manager-domain.api b/event-manager/domain/api/event-manager-domain.api
index a335fb494..02d0608bd 100644
--- a/event-manager/domain/api/event-manager-domain.api
+++ b/event-manager/domain/api/event-manager-domain.api
@@ -206,6 +206,15 @@ public abstract interface class me/proton/core/eventmanager/domain/EventManagerP
 	public abstract fun getAll (Lme/proton/core/domain/entity/UserId;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public final class me/proton/core/eventmanager/domain/LogTag {
+	public static final field COLLECT_ERROR Ljava/lang/String;
+	public static final field FETCH_ERROR Ljava/lang/String;
+	public static final field INSTANCE Lme/proton/core/eventmanager/domain/LogTag;
+	public static final field NOTIFY_ERROR Ljava/lang/String;
+	public static final field WORKER_ERROR Ljava/lang/String;
+	public final fun getREPORT_MAX_RETRY-WnFgrgw ()Ljava/lang/String;
+}
+
 public abstract interface class me/proton/core/eventmanager/domain/TransactionHandler {
 	public abstract fun inTransaction (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
diff --git a/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/LogTag.kt b/event-manager/domain/src/main/kotlin/me/proton/core/eventmanager/domain/LogTag.kt
similarity index 96%
rename from event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/LogTag.kt
rename to event-manager/domain/src/main/kotlin/me/proton/core/eventmanager/domain/LogTag.kt
index ca1a4ac24..feaa0ea8e 100644
--- a/event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/LogTag.kt
+++ b/event-manager/domain/src/main/kotlin/me/proton/core/eventmanager/domain/LogTag.kt
@@ -16,7 +16,7 @@
  * along with ProtonCore.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.proton.core.eventmanager.data
+package me.proton.core.eventmanager.domain
 
 import me.proton.core.util.kotlin.LoggerLogTag
 
diff --git a/feature-flag/data/api/feature-flag-data.api b/feature-flag/data/api/feature-flag-data.api
index 5ff8b4101..524ca43df 100644
--- a/feature-flag/data/api/feature-flag-data.api
+++ b/feature-flag/data/api/feature-flag-data.api
@@ -30,11 +30,6 @@ public final class me/proton/core/featureflag/data/FeatureFlagManagerImpl_Factor
 	public static fun newInstance (Lme/proton/core/featureflag/domain/repository/FeatureFlagRepository;)Lme/proton/core/featureflag/data/FeatureFlagManagerImpl;
 }
 
-public final class me/proton/core/featureflag/data/LogTag {
-	public static final field FEATURE_FLAG_NOT_FOUND Ljava/lang/String;
-	public static final field INSTANCE Lme/proton/core/featureflag/data/LogTag;
-}
-
 public abstract class me/proton/core/featureflag/data/db/FeatureFlagDao : me/proton/core/data/room/db/BaseDao {
 	public fun <init> ()V
 }
diff --git a/feature-flag/data/src/main/kotlin/me/proton/core/featureflag/data/remote/FeatureFlagRemoteDataSourceImpl.kt b/feature-flag/data/src/main/kotlin/me/proton/core/featureflag/data/remote/FeatureFlagRemoteDataSourceImpl.kt
index 5de6425ca..a12ab4b1b 100644
--- a/feature-flag/data/src/main/kotlin/me/proton/core/featureflag/data/remote/FeatureFlagRemoteDataSourceImpl.kt
+++ b/feature-flag/data/src/main/kotlin/me/proton/core/featureflag/data/remote/FeatureFlagRemoteDataSourceImpl.kt
@@ -21,7 +21,7 @@ package me.proton.core.featureflag.data.remote
 import androidx.work.ExistingWorkPolicy
 import androidx.work.WorkManager
 import me.proton.core.domain.entity.UserId
-import me.proton.core.featureflag.data.LogTag
+import me.proton.core.featureflag.domain.LogTag
 import me.proton.core.featureflag.data.remote.worker.FetchFeatureIdsWorker
 import me.proton.core.featureflag.data.remote.worker.UpdateFeatureFlagWorker
 import me.proton.core.featureflag.domain.entity.FeatureFlag
diff --git a/feature-flag/domain/api/feature-flag-domain.api b/feature-flag/domain/api/feature-flag-domain.api
index acdff5f4b..1806f031f 100644
--- a/feature-flag/domain/api/feature-flag-domain.api
+++ b/feature-flag/domain/api/feature-flag-domain.api
@@ -14,6 +14,11 @@ public final class me/proton/core/featureflag/domain/FeatureFlagManager$DefaultI
 	public static synthetic fun observeOrDefault$default (Lme/proton/core/featureflag/domain/FeatureFlagManager;Lme/proton/core/domain/entity/UserId;Lme/proton/core/featureflag/domain/entity/FeatureId;Lme/proton/core/featureflag/domain/entity/FeatureFlag;ZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 }
 
+public final class me/proton/core/featureflag/domain/LogTag {
+	public static final field FEATURE_FLAG_NOT_FOUND Ljava/lang/String;
+	public static final field INSTANCE Lme/proton/core/featureflag/domain/LogTag;
+}
+
 public final class me/proton/core/featureflag/domain/entity/FeatureFlag {
 	public static final field Companion Lme/proton/core/featureflag/domain/entity/FeatureFlag$Companion;
 	public fun <init> (Lme/proton/core/domain/entity/UserId;Lme/proton/core/featureflag/domain/entity/FeatureId;Lme/proton/core/featureflag/domain/entity/Scope;ZZ)V
diff --git a/feature-flag/data/src/main/kotlin/me/proton/core/featureflag/data/LogTag.kt b/feature-flag/domain/src/main/kotlin/me/proton/core/featureflag/domain/LogTag.kt
similarity index 95%
rename from feature-flag/data/src/main/kotlin/me/proton/core/featureflag/data/LogTag.kt
rename to feature-flag/domain/src/main/kotlin/me/proton/core/featureflag/domain/LogTag.kt
index 1ab392b85..9b4649806 100644
--- a/feature-flag/data/src/main/kotlin/me/proton/core/featureflag/data/LogTag.kt
+++ b/feature-flag/domain/src/main/kotlin/me/proton/core/featureflag/domain/LogTag.kt
@@ -16,7 +16,7 @@
  * along with ProtonCore.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.proton.core.featureflag.data
+package me.proton.core.featureflag.domain
 
 public object LogTag {
     /** Tag for feature flags not found. */
diff --git a/human-verification/data/api/human-verification-data.api b/human-verification/data/api/human-verification-data.api
index 7cf075908..1b789fee1 100644
--- a/human-verification/data/api/human-verification-data.api
+++ b/human-verification/data/api/human-verification-data.api
@@ -41,12 +41,6 @@ public final class me/proton/core/humanverification/data/HumanVerificationProvid
 	public fun getHumanVerificationDetails (Lme/proton/core/network/domain/client/ClientId;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class me/proton/core/humanverification/data/LogTag {
-	public static final field DEFAULT Ljava/lang/String;
-	public static final field INSTANCE Lme/proton/core/humanverification/data/LogTag;
-	public static final field SRP_CHALLENGE_ERROR Ljava/lang/String;
-}
-
 public final class me/proton/core/humanverification/data/db/HumanVerificationConverters {
 	public fun <init> ()V
 	public final fun fromClientIdTypeToString (Lme/proton/core/network/domain/client/ClientIdType;)Ljava/lang/String;
diff --git a/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/DeviceVerificationListenerImpl.kt b/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/DeviceVerificationListenerImpl.kt
index 279f7cf23..6e9874689 100644
--- a/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/DeviceVerificationListenerImpl.kt
+++ b/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/DeviceVerificationListenerImpl.kt
@@ -19,6 +19,7 @@
 package me.proton.core.humanverification.data
 
 import me.proton.core.crypto.common.srp.SrpChallenge
+import me.proton.core.humanverification.domain.LogTag
 import me.proton.core.network.domain.deviceverification.ChallengeType.Argon2
 import me.proton.core.network.domain.deviceverification.ChallengeType.Ecdlp
 import me.proton.core.network.domain.deviceverification.ChallengeType.WASM
diff --git a/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/utils/NetworkRequestOverriderImpl.kt b/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/utils/NetworkRequestOverriderImpl.kt
index d49c15056..32236a5fa 100644
--- a/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/utils/NetworkRequestOverriderImpl.kt
+++ b/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/utils/NetworkRequestOverriderImpl.kt
@@ -20,7 +20,7 @@ package me.proton.core.humanverification.data.utils
 
 import androidx.annotation.VisibleForTesting
 import me.proton.core.humanverification.domain.utils.NetworkRequestOverrider
-import me.proton.core.network.data.LogTag
+import me.proton.core.network.domain.LogTag
 import me.proton.core.network.data.di.Constants
 import me.proton.core.network.data.di.SharedOkHttpClient
 import me.proton.core.network.data.initSPKIleafPinning
diff --git a/human-verification/domain/api/human-verification-domain.api b/human-verification/domain/api/human-verification-domain.api
index 8d66a153d..5b769b026 100644
--- a/human-verification/domain/api/human-verification-domain.api
+++ b/human-verification/domain/api/human-verification-domain.api
@@ -30,6 +30,12 @@ public abstract interface class me/proton/core/humanverification/domain/HumanVer
 	public abstract fun handleHumanVerificationSuccess (Lme/proton/core/network/domain/client/ClientId;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public final class me/proton/core/humanverification/domain/LogTag {
+	public static final field DEFAULT Ljava/lang/String;
+	public static final field INSTANCE Lme/proton/core/humanverification/domain/LogTag;
+	public static final field SRP_CHALLENGE_ERROR Ljava/lang/String;
+}
+
 public final class me/proton/core/humanverification/domain/entity/TokenType : java/lang/Enum {
 	public static final field CAPTCHA Lme/proton/core/humanverification/domain/entity/TokenType;
 	public static final field Companion Lme/proton/core/humanverification/domain/entity/TokenType$Companion;
diff --git a/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/LogTag.kt b/human-verification/domain/src/main/kotlin/me/proton/core/humanverification/domain/LogTag.kt
similarity index 95%
rename from human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/LogTag.kt
rename to human-verification/domain/src/main/kotlin/me/proton/core/humanverification/domain/LogTag.kt
index b9221a355..a1a0b8c35 100644
--- a/human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/LogTag.kt
+++ b/human-verification/domain/src/main/kotlin/me/proton/core/humanverification/domain/LogTag.kt
@@ -16,7 +16,7 @@
  * along with ProtonCore.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.proton.core.humanverification.data
+package me.proton.core.humanverification.domain
 
 object LogTag {
     /** Default tag for this module. */
diff --git a/network/data/api/network-data.api b/network/data/api/network-data.api
index a68124128..137602f85 100644
--- a/network/data/api/network-data.api
+++ b/network/data/api/network-data.api
@@ -45,15 +45,6 @@ public final class me/proton/core/network/data/LeafSPKIPinningTrustManager : jav
 	public fun getAcceptedIssuers ()[Ljava/security/cert/X509Certificate;
 }
 
-public final class me/proton/core/network/data/LogTag {
-	public static final field DEFAULT Ljava/lang/String;
-	public static final field INSTANCE Lme/proton/core/network/data/LogTag;
-	public final fun getAPI_ERROR-WnFgrgw ()Ljava/lang/String;
-	public final fun getAPI_REQUEST-WnFgrgw ()Ljava/lang/String;
-	public final fun getAPI_RESPONSE-WnFgrgw ()Ljava/lang/String;
-	public final fun getSERVER_TIME_PARSE_ERROR-WnFgrgw ()Ljava/lang/String;
-}
-
 public final class me/proton/core/network/data/NetworkPrefsImpl : me/proton/core/network/domain/NetworkPrefs, me/proton/core/util/android/sharedpreferences/PreferencesProvider {
 	public static final field Companion Lme/proton/core/network/data/NetworkPrefsImpl$Companion;
 	public fun <init> (Landroid/content/Context;)V
diff --git a/network/data/src/main/kotlin/me/proton/core/network/data/ApiResultUtils.kt b/network/data/src/main/kotlin/me/proton/core/network/data/ApiResultUtils.kt
index aa4a4021f..7f3b0861e 100644
--- a/network/data/src/main/kotlin/me/proton/core/network/data/ApiResultUtils.kt
+++ b/network/data/src/main/kotlin/me/proton/core/network/data/ApiResultUtils.kt
@@ -20,6 +20,7 @@ package me.proton.core.network.data
 import kotlinx.serialization.SerializationException
 import me.proton.core.network.data.protonApi.BaseRetrofitApi
 import me.proton.core.network.domain.ApiResult
+import me.proton.core.network.domain.LogTag
 import me.proton.core.network.domain.NetworkManager
 import me.proton.core.util.kotlin.CoreLogger
 import okhttp3.Response
diff --git a/network/data/src/main/kotlin/me/proton/core/network/data/LoggingUtils.kt b/network/data/src/main/kotlin/me/proton/core/network/data/LoggingUtils.kt
index a1699a078..7331a51d8 100644
--- a/network/data/src/main/kotlin/me/proton/core/network/data/LoggingUtils.kt
+++ b/network/data/src/main/kotlin/me/proton/core/network/data/LoggingUtils.kt
@@ -19,6 +19,7 @@ package me.proton.core.network.data
 
 import android.os.SystemClock
 import me.proton.core.network.domain.ApiClient
+import me.proton.core.network.domain.LogTag
 import me.proton.core.util.kotlin.CoreLogger
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
diff --git a/network/data/src/main/kotlin/me/proton/core/network/data/interceptor/ServerTimeInterceptor.kt b/network/data/src/main/kotlin/me/proton/core/network/data/interceptor/ServerTimeInterceptor.kt
index f2474d8de..09d99273b 100644
--- a/network/data/src/main/kotlin/me/proton/core/network/data/interceptor/ServerTimeInterceptor.kt
+++ b/network/data/src/main/kotlin/me/proton/core/network/data/interceptor/ServerTimeInterceptor.kt
@@ -18,7 +18,7 @@
 
 package me.proton.core.network.data.interceptor
 
-import me.proton.core.network.data.LogTag
+import me.proton.core.network.domain.LogTag
 import me.proton.core.network.domain.server.ServerTimeListener
 import me.proton.core.util.kotlin.CoreLogger
 import okhttp3.Interceptor
diff --git a/network/domain/api/network-domain.api b/network/domain/api/network-domain.api
index aef80c76a..614fdb1dc 100644
--- a/network/domain/api/network-domain.api
+++ b/network/domain/api/network-domain.api
@@ -228,6 +228,15 @@ public final class me/proton/core/network/domain/HttpResponseCodes {
 	public static final field INSTANCE Lme/proton/core/network/domain/HttpResponseCodes;
 }
 
+public final class me/proton/core/network/domain/LogTag {
+	public static final field DEFAULT Ljava/lang/String;
+	public static final field INSTANCE Lme/proton/core/network/domain/LogTag;
+	public final fun getAPI_ERROR-WnFgrgw ()Ljava/lang/String;
+	public final fun getAPI_REQUEST-WnFgrgw ()Ljava/lang/String;
+	public final fun getAPI_RESPONSE-WnFgrgw ()Ljava/lang/String;
+	public final fun getSERVER_TIME_PARSE_ERROR-WnFgrgw ()Ljava/lang/String;
+}
+
 public abstract class me/proton/core/network/domain/NetworkManager {
 	public fun <init> ()V
 	public abstract fun getNetworkStatus ()Lme/proton/core/network/domain/NetworkStatus;
diff --git a/network/data/src/main/kotlin/me/proton/core/network/data/LogTag.kt b/network/domain/src/main/kotlin/me/proton/core/network/domain/LogTag.kt
similarity index 97%
rename from network/data/src/main/kotlin/me/proton/core/network/data/LogTag.kt
rename to network/domain/src/main/kotlin/me/proton/core/network/domain/LogTag.kt
index 74d097c3a..35d7f045c 100644
--- a/network/data/src/main/kotlin/me/proton/core/network/data/LogTag.kt
+++ b/network/domain/src/main/kotlin/me/proton/core/network/domain/LogTag.kt
@@ -16,7 +16,7 @@
  * along with ProtonCore.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.proton.core.network.data
+package me.proton.core.network.domain
 
 import me.proton.core.util.kotlin.LoggerLogTag
 
diff --git a/util/android/sentry/build.gradle.kts b/util/android/sentry/build.gradle.kts
index 8a896bb04..22137e773 100644
--- a/util/android/sentry/build.gradle.kts
+++ b/util/android/sentry/build.gradle.kts
@@ -32,16 +32,13 @@ android {
 dependencies {
     implementation(
         project(Module.kotlinUtil),
-        project(Module.presentation),
-        project(Module.networkData),
-        project(Module.eventManagerData),
-        project(Module.accountManagerData),
+        project(Module.networkDomain),
+        project(Module.eventManagerDomain),
+        project(Module.accountManagerDomain),
         `timber`,
     )
 
     api(
         `sentry`,
-        `sentry-android-core`,
-        `sentry-timber`
     )
 }
diff --git a/util/android/sentry/src/main/kotlin/me/proton/core/util/android/sentry/TimberLogger.kt b/util/android/sentry/src/main/kotlin/me/proton/core/util/android/sentry/TimberLogger.kt
index 9b08ab7c2..1255ab1d8 100644
--- a/util/android/sentry/src/main/kotlin/me/proton/core/util/android/sentry/TimberLogger.kt
+++ b/util/android/sentry/src/main/kotlin/me/proton/core/util/android/sentry/TimberLogger.kt
@@ -18,12 +18,12 @@
 
 package me.proton.core.util.android.sentry
 
-import me.proton.core.accountmanager.data.LogTag.SESSION_FORCE_LOGOUT
-import me.proton.core.eventmanager.data.LogTag.REPORT_MAX_RETRY
-import me.proton.core.network.data.LogTag.API_ERROR
-import me.proton.core.network.data.LogTag.API_REQUEST
-import me.proton.core.network.data.LogTag.API_RESPONSE
-import me.proton.core.network.data.LogTag.SERVER_TIME_PARSE_ERROR
+import me.proton.core.accountmanager.domain.LogTag.SESSION_FORCE_LOGOUT
+import me.proton.core.eventmanager.domain.LogTag.REPORT_MAX_RETRY
+import me.proton.core.network.domain.LogTag.API_ERROR
+import me.proton.core.network.domain.LogTag.API_REQUEST
+import me.proton.core.network.domain.LogTag.API_RESPONSE
+import me.proton.core.network.domain.LogTag.SERVER_TIME_PARSE_ERROR
 import me.proton.core.network.domain.ApiException
 import me.proton.core.network.domain.ApiResult
 import me.proton.core.util.kotlin.Logger