diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java
index b65b87c6f3..96464668b6 100644
--- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java
@@ -22,15 +22,12 @@ import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 @Schema
 public class ThingsboardErrorResponse {
     // HTTP Response Status Code
-    @Schema
     private final HttpStatus status;
 
     // General Error message
-    @Schema
     private final String message;
 
     // Error code
-    @Schema
     private final ThingsboardErrorCode errorCode;
 
     private final long timestamp;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java b/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java
index 1c5dd03327..ea645f9757 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java
@@ -15,14 +15,12 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 
 import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-@Schema(enumAsRef = true)
 public enum AttributeScope {
 
     CLIENT_SCOPE(1),
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/AiModelType.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/AiModelType.java
index 8f2b5e9db7..365e375f58 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/AiModelType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/AiModelType.java
@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.common.data.ai.model;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(enumAsRef = true)
 public enum AiModelType {
 
     CHAT
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProvider.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProvider.java
index cae26a0f27..a85944d074 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProvider.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProvider.java
@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.common.data.ai.provider;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(enumAsRef = true)
 public enum AiProvider {
 
     OPENAI,
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ScriptCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ScriptCalculatedFieldConfiguration.java
index 195cd8073d..4ee9268c78 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ScriptCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ScriptCalculatedFieldConfiguration.java
@@ -25,10 +25,7 @@ import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 @EqualsAndHashCode(callSuper = true)
 public class ScriptCalculatedFieldConfiguration extends BaseCalculatedFieldConfiguration implements CalculatedFieldConfiguration {
 
-    @Schema(
-            description = "Type of calculated field configuration",
-            requiredMode = Schema.RequiredMode.REQUIRED
-    )
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CalculatedFieldType getType() {
         return CalculatedFieldType.SCRIPT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/SimpleCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/SimpleCalculatedFieldConfiguration.java
index 43be3445a3..0f8999989f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/SimpleCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/SimpleCalculatedFieldConfiguration.java
@@ -27,10 +27,7 @@ public class SimpleCalculatedFieldConfiguration extends BaseCalculatedFieldConfi
 
     private boolean useLatestTs;
 
-    @Schema(
-            description = "Type of calculated field configuration",
-            requiredMode = Schema.RequiredMode.REQUIRED
-    )
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CalculatedFieldType getType() {
         return CalculatedFieldType.SIMPLE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityDataSortOrder.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityDataSortOrder.java
index 54e52fbc06..c7b933add5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityDataSortOrder.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityDataSortOrder.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.query;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+@Schema
 @Data
 public class EntityDataSortOrder {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKeyType.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKeyType.java
index 3722ea0dc5..648c91df27 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKeyType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKeyType.java
@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(enumAsRef = true)
 public enum EntityKeyType {
     ATTRIBUTE,
     CLIENT_ATTRIBUTE,
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/FilterPredicateType.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/FilterPredicateType.java
index 4413848cdf..cd028071c2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/FilterPredicateType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/FilterPredicateType.java
@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(enumAsRef = true)
 public enum FilterPredicateType {
     STRING,
     NUMERIC,
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/transport/resource/ResourceType.java b/common/data/src/main/java/org/thingsboard/server/common/data/transport/resource/ResourceType.java
index 64aea6ff64..973b4807d3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/transport/resource/ResourceType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/transport/resource/ResourceType.java
@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.common.data.transport.resource;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(enumAsRef = true)
 public enum ResourceType {
     LWM2M_MODEL, JKS, PKCS_12
 }