diff --git a/libraries/Matter/src/MatterContact.cpp b/libraries/Matter/src/MatterContact.cpp
index 5d5dbd4..bc1bff0 100644
--- a/libraries/Matter/src/MatterContact.cpp
+++ b/libraries/Matter/src/MatterContact.cpp
@@ -35,7 +35,7 @@ const EmberAfDeviceType gContactSensorDeviceTypes[] = { { DEVICE_TYPE_CONTACT_SE
 
 // Boolean state cluster attributes
 DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(booleanStateAttrs)
-DECLARE_DYNAMIC_ATTRIBUTE(BooleanState::Attributes::StateValue::Id, INT8U, 1, 0),               /* StateValue */
+DECLARE_DYNAMIC_ATTRIBUTE(BooleanState::Attributes::StateValue::Id, BOOLEAN, 1, 0),             /* StateValue */
 DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();                                                           /* ClusterRevision auto added by LIST_END */
 
 // Contact sensor cluster list
diff --git a/libraries/Matter/src/MatterDoorLock.cpp b/libraries/Matter/src/MatterDoorLock.cpp
index 8f0bff5..ee666dd 100644
--- a/libraries/Matter/src/MatterDoorLock.cpp
+++ b/libraries/Matter/src/MatterDoorLock.cpp
@@ -43,7 +43,7 @@ constexpr CommandId doorLockIncomingCommands[] = {
 DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(doorLockAttrs)
 DECLARE_DYNAMIC_ATTRIBUTE(DoorLock::Attributes::LockState::Id, INT8U, 1, ATTRIBUTE_MASK_NULLABLE),  // LockState
 DECLARE_DYNAMIC_ATTRIBUTE(DoorLock::Attributes::LockType::Id, INT8U, 1, 0),                         // LockType
-DECLARE_DYNAMIC_ATTRIBUTE(DoorLock::Attributes::ActuatorEnabled::Id, INT8U, 1, 0),                  // ActuatorEnabled
+DECLARE_DYNAMIC_ATTRIBUTE(DoorLock::Attributes::ActuatorEnabled::Id, BOOLEAN, 1, 0),                // ActuatorEnabled
 DECLARE_DYNAMIC_ATTRIBUTE(DoorLock::Attributes::OperatingMode::Id, INT8U, 1, 0),                    // OperatingMode
 DECLARE_DYNAMIC_ATTRIBUTE(DoorLock::Attributes::SupportedOperatingModes::Id, INT16U, 2, 0),         // SupportedOperatingModes
 DECLARE_DYNAMIC_ATTRIBUTE(DoorLock::Attributes::FeatureMap::Id, BITMAP32, 4, 0),                    // FeatureMap