diff --git a/src/common/meta/ingestion.rs b/src/common/meta/ingestion.rs
index 222887f0a9..8d2fba48ff 100644
--- a/src/common/meta/ingestion.rs
+++ b/src/common/meta/ingestion.rs
@@ -124,8 +124,7 @@ pub struct BulkResponseItem {
     pub status: i64,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub error: Option<BulkResponseError>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(rename = "originalRecord")]
+    #[serde(skip_serializing_if = "Option::is_none", rename = "originalRecord")]
     #[schema(value_type = Object)]
     pub original_record: Option<json::Value>,
 }
diff --git a/src/config/src/meta/dashboards/v3/mod.rs b/src/config/src/meta/dashboards/v3/mod.rs
index c65b86405f..86c8a8a604 100644
--- a/src/config/src/meta/dashboards/v3/mod.rs
+++ b/src/config/src/meta/dashboards/v3/mod.rs
@@ -222,8 +222,7 @@ pub struct PanelConfig {
 pub struct DrillDown {
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(rename = "type")]
+    #[serde(skip_serializing_if = "Option::is_none", rename="type")]
     type_field: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     target_blank: Option<bool>,
diff --git a/src/config/src/meta/dashboards/v4/mod.rs b/src/config/src/meta/dashboards/v4/mod.rs
index 71c0c9da82..e307e01a6e 100644
--- a/src/config/src/meta/dashboards/v4/mod.rs
+++ b/src/config/src/meta/dashboards/v4/mod.rs
@@ -234,8 +234,7 @@ pub struct PanelConfig {
 pub struct DrillDown {
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(rename = "type")]
+    #[serde(skip_serializing_if = "Option::is_none", rename = "type")]
     type_field: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     target_blank: Option<bool>,
@@ -250,8 +249,7 @@ pub struct DrillDown {
 pub struct MarkLine {
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(rename = "type")]
+    #[serde(skip_serializing_if = "Option::is_none", rename = "type")]
     typee: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     value: Option<String>,
diff --git a/src/config/src/meta/dashboards/v5/mod.rs b/src/config/src/meta/dashboards/v5/mod.rs
index 774d9e19ed..f79a31178c 100644
--- a/src/config/src/meta/dashboards/v5/mod.rs
+++ b/src/config/src/meta/dashboards/v5/mod.rs
@@ -318,8 +318,7 @@ pub struct ColorCfg {
 #[derive(Debug, Clone, PartialEq, Hash, Serialize, Deserialize, ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct Mapping {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(rename = "type")]
+    #[serde(skip_serializing_if = "Option::is_none", rename="type")]
     typee: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     value: Option<String>,
@@ -329,8 +328,7 @@ pub struct Mapping {
     to: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pattern: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(rename = "match")]
+    #[serde(skip_serializing_if = "Option::is_none", rename="match")]
     matchh: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<String>,
@@ -343,8 +341,7 @@ pub struct Mapping {
 pub struct DrillDown {
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(rename = "type")]
+    #[serde(skip_serializing_if = "Option::is_none", rename="type")]
     type_field: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     target_blank: Option<bool>,
@@ -359,8 +356,7 @@ pub struct DrillDown {
 pub struct MarkLine {
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(rename = "type")]
+    #[serde(skip_serializing_if = "Option::is_none", rename="type")]
     typee: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     value: Option<String>,
diff --git a/src/config/src/meta/self_reporting/error.rs b/src/config/src/meta/self_reporting/error.rs
index 94da7f2513..694b9f456b 100644
--- a/src/config/src/meta/self_reporting/error.rs
+++ b/src/config/src/meta/self_reporting/error.rs
@@ -48,8 +48,7 @@ pub struct PipelineError {
     pub pipeline_name: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub error: Option<String>,
-    #[serde(skip_serializing_if = "HashMap::is_empty")]
-    #[serde(serialize_with = "serialize_values_only")]
+    #[serde(skip_serializing_if = "HashMap::is_empty", serialize_with = "serialize_values_only")]
     pub node_errors: HashMap<String, NodeErrors>,
 }
 
diff --git a/src/config/src/meta/stream.rs b/src/config/src/meta/stream.rs
index b7c148f161..99470eeeeb 100644
--- a/src/config/src/meta/stream.rs
+++ b/src/config/src/meta/stream.rs
@@ -553,8 +553,7 @@ pub struct UpdateSettingsWrapper<D> {
 pub struct UpdateStreamSettings {
     #[serde(skip_serializing_if = "Option::None")]
     pub partition_time_level: Option<PartitionTimeLevel>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    #[serde(default)]
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
     pub partition_keys: UpdateSettingsWrapper<StreamPartition>,
     #[serde(default)]
     pub full_text_search_keys: UpdateSettingsWrapper<String>,
@@ -562,11 +561,9 @@ pub struct UpdateStreamSettings {
     pub index_fields: UpdateSettingsWrapper<String>,
     #[serde(default)]
     pub bloom_filter_fields: UpdateSettingsWrapper<String>,
-    #[serde(skip_serializing_if = "Option::None")]
-    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::None", default)]
     pub data_retention: Option<i64>,
-    #[serde(skip_serializing_if = "Option::None")]
-    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::None", default)]
     pub flatten_level: Option<i64>,
     #[serde(default)]
     pub defined_schema_fields: UpdateSettingsWrapper<String>,
@@ -681,14 +678,11 @@ impl TimeRange {
 pub struct StreamSettings {
     #[serde(skip_serializing_if = "Option::None")]
     pub partition_time_level: Option<PartitionTimeLevel>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    #[serde(default)]
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
     pub partition_keys: Vec<StreamPartition>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    #[serde(default)]
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
     pub full_text_search_keys: Vec<String>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    #[serde(default)]
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
     pub index_fields: Vec<String>,
     #[serde(default)]
     pub bloom_filter_fields: Vec<String>,
@@ -704,8 +698,7 @@ pub struct StreamSettings {
     pub store_original_data: bool,
     #[serde(default)]
     pub approx_partition: bool,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    #[serde(default)]
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
     pub distinct_value_fields: Vec<DistinctField>,
     #[serde(default)]
     pub index_updated_at: i64,
diff --git a/src/infra/src/table/migration/m20250107_160900_delete_bad_dashboards.rs b/src/infra/src/table/migration/m20250107_160900_delete_bad_dashboards.rs
index e556532111..156d1bb2c8 100644
--- a/src/infra/src/table/migration/m20250107_160900_delete_bad_dashboards.rs
+++ b/src/infra/src/table/migration/m20250107_160900_delete_bad_dashboards.rs
@@ -687,8 +687,7 @@ mod v3 {
     pub struct DrillDown {
         #[serde(skip_serializing_if = "Option::is_none")]
         name: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        #[serde(rename = "type")]
+        #[serde(skip_serializing_if = "Option::is_none", rename="type")]
         type_field: Option<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
         target_blank: Option<bool>,
@@ -1027,8 +1026,7 @@ mod v4 {
     pub struct DrillDown {
         #[serde(skip_serializing_if = "Option::is_none")]
         name: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        #[serde(rename = "type")]
+        #[serde(skip_serializing_if = "Option::is_none", rename="type")]
         type_field: Option<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
         target_blank: Option<bool>,
@@ -1043,8 +1041,7 @@ mod v4 {
     pub struct MarkLine {
         #[serde(skip_serializing_if = "Option::is_none")]
         name: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        #[serde(rename = "type")]
+        #[serde(skip_serializing_if = "Option::is_none", rename="type")]
         typee: Option<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
         value: Option<String>,
@@ -1433,8 +1430,7 @@ mod v5 {
     #[derive(Deserialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Mapping {
-        #[serde(skip_serializing_if = "Option::is_none")]
-        #[serde(rename = "type")]
+        #[serde(skip_serializing_if = "Option::is_none", rename="type")]
         typee: Option<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
         value: Option<String>,
@@ -1444,8 +1440,7 @@ mod v5 {
         to: Option<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
         pattern: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        #[serde(rename = "match")]
+        #[serde(skip_serializing_if = "Option::is_none", rename="match")]
         matchh: Option<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
         color: Option<String>,
@@ -1458,8 +1453,7 @@ mod v5 {
     pub struct DrillDown {
         #[serde(skip_serializing_if = "Option::is_none")]
         name: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        #[serde(rename = "type")]
+        #[serde(skip_serializing_if = "Option::is_none", rename="type")]
         type_field: Option<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
         target_blank: Option<bool>,
@@ -1474,8 +1468,7 @@ mod v5 {
     pub struct MarkLine {
         #[serde(skip_serializing_if = "Option::is_none")]
         name: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        #[serde(rename = "type")]
+        #[serde(skip_serializing_if = "Option::is_none", rename="type")]
         typee: Option<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
         value: Option<String>,