diff --git a/src/shared/utils/Registry/RegistryTypes.h b/src/shared/utils/Registry/RegistryTypes.h
index fa05eb9bdebeed21dba5c530ec3efebf7fe40e94..c9f619a49b6bf876f1b57dd9aeb66a45705b44e2 100644
--- a/src/shared/utils/Registry/RegistryTypes.h
+++ b/src/shared/utils/Registry/RegistryTypes.h
@@ -38,7 +38,7 @@ struct Coordinates
 using ConfigurationId = uint32_t;
 
 // Types used for the union
-enum TypesEnum
+enum class TypesEnum
 {
     UINT32,
     FLOAT,
@@ -64,7 +64,7 @@ static_assert(
 /**
  * @brief RegistryError enumeration as return type.
  */
-enum RegistryError
+enum class RegistryError
 {
     OK,                         ///< Correct condition
     MALFORMED_SERIALIZED_DATA,  ///< Malformed data while deserializing