diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
index e91daf75e7..a38390ef81 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
@@ -1,13 +1,10 @@
 package org.thingsboard.server.common.data.oauth2;
 
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
+import lombok.*;
 
 @Builder(toBuilder = true)
 @EqualsAndHashCode
-@Getter
+@Data
 @ToString
 public class OAuth2BasicMapperConfig {
     private final String emailAttributeKey;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2CustomMapperConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2CustomMapperConfig.java
index ea9c963721..ad401e0aff 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2CustomMapperConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2CustomMapperConfig.java
@@ -1,13 +1,10 @@
 package org.thingsboard.server.common.data.oauth2;
 
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
+import lombok.*;
 
 @Builder(toBuilder = true)
 @EqualsAndHashCode
-@Getter
+@Data
 @ToString(exclude = {"password"})
 public class OAuth2CustomMapperConfig {
     private final String url;