diff --git a/monkey/monkey_island/cc/repository/__init__.py b/monkey/monkey_island/cc/repository/__init__.py
index d67515ee6..232a0b165 100644
--- a/monkey/monkey_island/cc/repository/__init__.py
+++ b/monkey/monkey_island/cc/repository/__init__.py
@@ -6,6 +6,7 @@ from .i_agent_binary_repository import IAgentBinaryRepository
 from .i_agent_configuration_repository import IAgentConfigurationRepository
 from .i_simulation_repository import ISimulationRepository
 from .i_credentials_repository import ICredentialsRepository
+from .i_user_repository import IUserRepository
 
 
 from .local_storage_file_repository import LocalStorageFileRepository
diff --git a/monkey/monkey_island/cc/services/authentication/i_user_datastore.py b/monkey/monkey_island/cc/repository/i_user_repository.py
similarity index 93%
rename from monkey/monkey_island/cc/services/authentication/i_user_datastore.py
rename to monkey/monkey_island/cc/repository/i_user_repository.py
index c25c11ee6..ee0e17f0a 100644
--- a/monkey/monkey_island/cc/services/authentication/i_user_datastore.py
+++ b/monkey/monkey_island/cc/repository/i_user_repository.py
@@ -1,6 +1,6 @@
 import abc
 
-from .user_creds import UserCreds
+from monkey_island.cc.services.authentication.user_creds import UserCreds
 
 
 class IUserRepository(metaclass=abc.ABCMeta):
diff --git a/monkey/monkey_island/cc/services/authentication/authentication_service.py b/monkey/monkey_island/cc/services/authentication/authentication_service.py
index 8e825fbea..d8f445115 100644
--- a/monkey/monkey_island/cc/services/authentication/authentication_service.py
+++ b/monkey/monkey_island/cc/services/authentication/authentication_service.py
@@ -7,13 +7,13 @@ from common.utils.exceptions import (
     InvalidRegistrationCredentialsError,
     UnknownUserError,
 )
+from monkey_island.cc.repository import IUserRepository
 from monkey_island.cc.server_utils.encryption import (
     reset_datastore_encryptor,
     unlock_datastore_encryptor,
 )
 from monkey_island.cc.setup.mongo.database_initializer import reset_database
 
-from .i_user_datastore import IUserRepository
 from .user_creds import UserCreds
 
 
diff --git a/monkey/monkey_island/cc/services/authentication/json_file_user_datastore.py b/monkey/monkey_island/cc/services/authentication/json_file_user_datastore.py
index 87ef873e1..a75310733 100644
--- a/monkey/monkey_island/cc/services/authentication/json_file_user_datastore.py
+++ b/monkey/monkey_island/cc/services/authentication/json_file_user_datastore.py
@@ -6,9 +6,9 @@ from common.utils.exceptions import (
     InvalidRegistrationCredentialsError,
     UnknownUserError,
 )
+from monkey_island.cc.repository import IUserRepository
 from monkey_island.cc.server_utils.file_utils import open_new_securely_permissioned_file
 
-from .i_user_datastore import IUserRepository
 from .user_creds import UserCreds
 
 CREDENTIALS_FILE = "credentials.json"
diff --git a/monkey/monkey_island/cc/services/initialize.py b/monkey/monkey_island/cc/services/initialize.py
index d5b197059..9474ea3bd 100644
--- a/monkey/monkey_island/cc/services/initialize.py
+++ b/monkey/monkey_island/cc/services/initialize.py
@@ -24,6 +24,7 @@ from monkey_island.cc.repository import (
     ICredentialsRepository,
     IFileRepository,
     ISimulationRepository,
+    IUserRepository,
     LocalStorageFileRepository,
     MongoCredentialsRepository,
     RetrievalError,
@@ -41,7 +42,6 @@ from monkey_island.cc.services.telemetry.processing.processing import (
 from monkey_island.cc.setup.mongo.mongo_setup import MONGO_URL
 
 from . import AuthenticationService, JSONFileUserRepository
-from .authentication.i_user_datastore import IUserRepository
 from .reporting.report import ReportService
 
 logger = logging.getLogger(__name__)
diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/test_authentication_service.py b/monkey/tests/unit_tests/monkey_island/cc/services/test_authentication_service.py
index 673d9ab33..6aa3dfbbd 100644
--- a/monkey/tests/unit_tests/monkey_island/cc/services/test_authentication_service.py
+++ b/monkey/tests/unit_tests/monkey_island/cc/services/test_authentication_service.py
@@ -8,9 +8,9 @@ from common.utils.exceptions import (
     InvalidRegistrationCredentialsError,
     UnknownUserError,
 )
+from monkey_island.cc.repository import IUserRepository
 from monkey_island.cc.services import AuthenticationService
 from monkey_island.cc.services.authentication import authentication_service
-from monkey_island.cc.services.authentication.i_user_datastore import IUserRepository
 from monkey_island.cc.services.authentication.user_creds import UserCreds
 
 USERNAME = "user1"