diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/dto/TbUserMessage.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/dto/TbUserMessage.java
index e1f0b84a4d..9e91adb2c0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/dto/TbUserMessage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/dto/TbUserMessage.java
@@ -25,12 +25,10 @@ import java.util.List;
 public record TbUserMessage(
         @NotEmpty
         @Valid
-        @ArraySchema(
-                arraySchema = @Schema(
-                        requiredMode = Schema.RequiredMode.REQUIRED,
-                        description = "A list of content parts that make up the complete user prompt"
-                ),
-                schema = @Schema(ref = "#/components/schemas/TbContent")
+        @Schema(
+                requiredMode = Schema.RequiredMode.REQUIRED,
+                description = "A list of content parts that make up the complete user prompt"
         )
+        @ArraySchema(schema = @Schema(ref = "#/components/schemas/TbContent"))
         List<TbContent> contents
 ) {}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AvailableEntityKeys.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AvailableEntityKeys.java
index a20d0dca55..532f7f2e1a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AvailableEntityKeys.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AvailableEntityKeys.java
@@ -37,17 +37,21 @@ public record AvailableEntityKeys(
         )
         Set<EntityType> entityTypes,
 
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
+        @Schema(
+                requiredMode = Schema.RequiredMode.REQUIRED,
+                description = "List of unique time series key names available on the matched entities."
+        )
         @ArraySchema(
-                arraySchema = @Schema(description = "List of unique time series key names available on the matched entities."),
                 schema = @Schema(implementation = String.class, example = "temperature"),
                 uniqueItems = true
         )
         List<String> timeseries,
 
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
+        @Schema(
+                requiredMode = Schema.RequiredMode.REQUIRED,
+                description = "List of unique attribute key names available on the matched entities."
+        )
         @ArraySchema(
-                arraySchema = @Schema(description = "List of unique attribute key names available on the matched entities."),
                 schema = @Schema(implementation = String.class, example = "serialNumber"),
                 uniqueItems = true
         )
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AvailableEntityKeysV2.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AvailableEntityKeysV2.java
index 536b70e4ff..608177b9ef 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AvailableEntityKeysV2.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AvailableEntityKeysV2.java
@@ -41,15 +41,13 @@ public record AvailableEntityKeysV2(
         )
         Set<EntityType> entityTypes,
 
-        @ArraySchema(
-                arraySchema = @Schema(
-                        description = """
-                                List of unique time series keys available on the matched entities, sorted alphabetically.
-                                Omitted when timeseries keys were not requested.""",
-                        nullable = true
-                ),
-                schema = @Schema(implementation = KeyInfo.class)
+        @Schema(
+                description = """
+                        List of unique time series keys available on the matched entities, sorted alphabetically.
+                        Omitted when timeseries keys were not requested.""",
+                nullable = true
         )
+        @ArraySchema(schema = @Schema(implementation = KeyInfo.class))
         @Nullable List<KeyInfo> timeseries,
 
         @Schema(
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/WidgetsBundleExportData.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/WidgetsBundleExportData.java
index 62140abdd1..6883fff6d4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/WidgetsBundleExportData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/WidgetsBundleExportData.java
@@ -36,7 +36,8 @@ public class WidgetsBundleExportData extends EntityExportData<WidgetsBundle> {
     @Override
     public EntityType getEntityType() { return EntityType.WIDGETS_BUNDLE; }
 
-    @ArraySchema(arraySchema = @Schema(description = "List of widgets in the bundle"), schema = @Schema(implementation = JsonNode.class))
+    @Schema(description = "List of widgets in the bundle")
+    @ArraySchema(schema = @Schema(implementation = JsonNode.class))
     @JsonProperty(index = 3)
     private List<ObjectNode> widgets;