diff --git a/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/AuthManagerImpl.kt b/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/AuthManagerImpl.kt
index fe9b3cf625..d6a31f0a6d 100644
--- a/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/AuthManagerImpl.kt
+++ b/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/AuthManagerImpl.kt
@@ -4,7 +4,9 @@ import com.simprints.core.domain.tokenization.asTokenizableRaw
 import com.simprints.infra.authlogic.authenticator.Authenticator
 import com.simprints.infra.authlogic.authenticator.SignerManager
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 internal class AuthManagerImpl @Inject constructor(
     private val authenticator: Authenticator,
     private val signerManager: SignerManager,
diff --git a/infra/config-sync/src/main/java/com/simprints/infra/config/sync/ConfigManager.kt b/infra/config-sync/src/main/java/com/simprints/infra/config/sync/ConfigManager.kt
index ed3c37befd..f29f83f55c 100644
--- a/infra/config-sync/src/main/java/com/simprints/infra/config/sync/ConfigManager.kt
+++ b/infra/config-sync/src/main/java/com/simprints/infra/config/sync/ConfigManager.kt
@@ -14,7 +14,9 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.onStart
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class ConfigManager @Inject constructor(
     private val configRepository: ConfigRepository,
     private val enrolmentRecordRepository: EnrolmentRecordRepository,
diff --git a/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImpl.kt b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImpl.kt
index 9a9a19a553..7dd4a975be 100644
--- a/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImpl.kt
+++ b/infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/EnrolmentRecordRepositoryImpl.kt
@@ -20,7 +20,9 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 internal class EnrolmentRecordRepositoryImpl @Inject constructor(
     private val remoteDataSource: EnrolmentRecordRemoteDataSource,
     @CommCareDataSource private val commCareDataSource: IdentityDataSource,