diff --git a/monkey/infection_monkey/credential_collectors/credential_components/lm_hash.py b/monkey/infection_monkey/credential_collectors/credential_components/lm_hash.py
index 1fef78437..5e89891ec 100644
--- a/monkey/infection_monkey/credential_collectors/credential_components/lm_hash.py
+++ b/monkey/infection_monkey/credential_collectors/credential_components/lm_hash.py
@@ -7,6 +7,6 @@ from infection_monkey.i_puppet import ICredentialComponent
 @dataclass(frozen=True)
 class LMHash(ICredentialComponent):
     credential_type: CredentialComponentType = field(
-        default=CredentialComponentType.LM_HASH.value, init=False
+        default=CredentialComponentType.LM_HASH, init=False
     )
     lm_hash: str
diff --git a/monkey/infection_monkey/credential_collectors/credential_components/nt_hash.py b/monkey/infection_monkey/credential_collectors/credential_components/nt_hash.py
index 07b9f859a..7e2328699 100644
--- a/monkey/infection_monkey/credential_collectors/credential_components/nt_hash.py
+++ b/monkey/infection_monkey/credential_collectors/credential_components/nt_hash.py
@@ -7,6 +7,6 @@ from infection_monkey.i_puppet import ICredentialComponent
 @dataclass(frozen=True)
 class NTHash(ICredentialComponent):
     credential_type: CredentialComponentType = field(
-        default=CredentialComponentType.NT_HASH.value, init=False
+        default=CredentialComponentType.NT_HASH, init=False
     )
     nt_hash: str
diff --git a/monkey/infection_monkey/credential_collectors/credential_components/password.py b/monkey/infection_monkey/credential_collectors/credential_components/password.py
index 3a05e3599..3601511af 100644
--- a/monkey/infection_monkey/credential_collectors/credential_components/password.py
+++ b/monkey/infection_monkey/credential_collectors/credential_components/password.py
@@ -7,6 +7,6 @@ from infection_monkey.i_puppet import ICredentialComponent
 @dataclass(frozen=True)
 class Password(ICredentialComponent):
     credential_type: CredentialComponentType = field(
-        default=CredentialComponentType.PASSWORD.value, init=False
+        default=CredentialComponentType.PASSWORD, init=False
     )
     password: str
diff --git a/monkey/infection_monkey/credential_collectors/credential_components/ssh_keypair.py b/monkey/infection_monkey/credential_collectors/credential_components/ssh_keypair.py
index 6abd314bb..16b943ea6 100644
--- a/monkey/infection_monkey/credential_collectors/credential_components/ssh_keypair.py
+++ b/monkey/infection_monkey/credential_collectors/credential_components/ssh_keypair.py
@@ -7,7 +7,7 @@ from infection_monkey.i_puppet import ICredentialComponent
 @dataclass(frozen=True)
 class SSHKeypair(ICredentialComponent):
     credential_type: CredentialComponentType = field(
-        default=CredentialComponentType.SSH_KEYPAIR.value, init=False
+        default=CredentialComponentType.SSH_KEYPAIR, init=False
     )
     private_key: str
     public_key: str
diff --git a/monkey/infection_monkey/credential_collectors/credential_components/username.py b/monkey/infection_monkey/credential_collectors/credential_components/username.py
index 791dd6abe..e7d55aa6f 100644
--- a/monkey/infection_monkey/credential_collectors/credential_components/username.py
+++ b/monkey/infection_monkey/credential_collectors/credential_components/username.py
@@ -7,6 +7,6 @@ from infection_monkey.i_puppet import ICredentialComponent
 @dataclass(frozen=True)
 class Username(ICredentialComponent):
     credential_type: CredentialComponentType = field(
-        default=CredentialComponentType.USERNAME.value, init=False
+        default=CredentialComponentType.USERNAME, init=False
     )
     username: str