diff --git a/monkey/monkey_island/cc/server_utils/encryption/data_store_encryptor.py b/monkey/monkey_island/cc/server_utils/encryption/data_store_encryptor.py
index bc5d44dd6..68bf8300f 100644
--- a/monkey/monkey_island/cc/server_utils/encryption/data_store_encryptor.py
+++ b/monkey/monkey_island/cc/server_utils/encryption/data_store_encryptor.py
@@ -3,6 +3,7 @@ import secrets
 from pathlib import Path
 from typing import Union
 
+from monkey_island.cc.server_utils.encryption.encryption_key_types import EncryptionKey32Bytes
 from monkey_island.cc.server_utils.file_utils import open_new_securely_permissioned_file
 
 from .i_encryptor import IEncryptor
@@ -35,7 +36,7 @@ class DataStoreEncryptor(IEncryptor):
         return KeyBasedEncryptor(plaintext_key)
 
     def _create_key(self) -> KeyBasedEncryptor:
-        plaintext_key = secrets.token_bytes(32)
+        plaintext_key = EncryptionKey32Bytes(secrets.token_bytes(32))
 
         encrypted_key = self._password_based_encryptor.encrypt(plaintext_key)
         with open_new_securely_permissioned_file(str(self._key_file), "wb") as f:
diff --git a/monkey/monkey_island/cc/server_utils/encryption/repository_encryptor.py b/monkey/monkey_island/cc/server_utils/encryption/repository_encryptor.py
index 3e73e6314..48970fa81 100644
--- a/monkey/monkey_island/cc/server_utils/encryption/repository_encryptor.py
+++ b/monkey/monkey_island/cc/server_utils/encryption/repository_encryptor.py
@@ -1,6 +1,7 @@
 import secrets
 from pathlib import Path
 
+from monkey_island.cc.server_utils.encryption.encryption_key_types import EncryptionKey32Bytes
 from monkey_island.cc.server_utils.file_utils import open_new_securely_permissioned_file
 
 from . import ILockableEncryptor, LockedKeyError, ResetKeyError, UnlockError
@@ -31,11 +32,11 @@ class RepositoryEncryptor(ILockableEncryptor):
         with open(self._key_file, "rb") as f:
             encrypted_key = f.read()
 
-        plaintext_key = self._password_based_encryptor.decrypt(encrypted_key)
+        plaintext_key = EncryptionKey32Bytes(self._password_based_encryptor.decrypt(encrypted_key))
         return KeyBasedEncryptor(plaintext_key)
 
     def _create_key(self) -> KeyBasedEncryptor:
-        plaintext_key = secrets.token_bytes(32)
+        plaintext_key = EncryptionKey32Bytes(secrets.token_bytes(32))
 
         encrypted_key = self._password_based_encryptor.encrypt(plaintext_key)
         with open_new_securely_permissioned_file(str(self._key_file), "wb") as f: