diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index 31eb0acc76..36cc09b229 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -11331,7 +11331,7 @@
       },
       "delete": {
         "tags": [
-          "indices"
+          "data stream"
         ],
         "summary": "Delete data streams",
         "description": "Deletes one or more data streams and their backing indices.",
@@ -11751,7 +11751,7 @@
       },
       "put": {
         "tags": [
-          "indices"
+          "data stream"
         ],
         "summary": "Update data stream lifecycles",
         "description": "Update the data stream lifecycle of the specified data streams.",
@@ -12377,7 +12377,7 @@
     "/{index}/_downsample/{target_index}": {
       "post": {
         "tags": [
-          "indices"
+          "data stream"
         ],
         "summary": "Downsample an index",
         "description": "Aggregate a time series (TSDS) index and store pre-computed statistical summaries (`min`, `max`, `sum`, `value_count` and `avg`) for each metric field grouped by a configured time interval.\nFor example, a TSDS index that contains metrics sampled every 10 seconds can be downsampled to an hourly index.\nAll documents within an hour interval are summarized and stored as a single document in the downsample index.\n\nNOTE: Only indices in a time series data stream are supported.\nNeither field nor document level security can be defined on the source index.\nThe source index must be read only (`index.blocks.write: true`).",
@@ -12496,7 +12496,7 @@
     "/{index}/_lifecycle/explain": {
       "get": {
         "tags": [
-          "indices"
+          "data stream"
         ],
         "summary": "Get the status for a data stream lifecycle",
         "description": "Get information about an index or data stream's current data stream lifecycle status, such as time since index creation, time since rollover, the lifecycle configuration managing the index, or any errors encountered during lifecycle execution.",
@@ -13704,7 +13704,7 @@
     "/_data_stream/_promote/{name}": {
       "post": {
         "tags": [
-          "indices"
+          "data stream"
         ],
         "summary": "Promote a data stream",
         "description": "Promote a data stream from a replicated data stream managed by cross-cluster replication (CCR) to a regular data stream.\n\nWith CCR auto following, a data stream from a remote cluster can be replicated to the local cluster.\nThese data streams can't be rolled over in the local cluster.\nThese replicated data streams roll over only if the upstream data stream rolls over.\nIn the event that the remote cluster is no longer available, the data stream in the local cluster can be promoted to a regular data stream, which allows these data streams to be rolled over in the local cluster.\n\nNOTE: When promoting a data stream, ensure the local cluster has a data stream enabled index template that matches the data stream.\nIf this is missing, the data stream will not be able to roll over until a matching index template is created.\nThis will affect the lifecycle management of the data stream and interfere with the data stream size and retention.",
@@ -70767,7 +70767,15 @@
       "ingest._types:DatabaseConfigurationFull": {
         "allOf": [
           {
-            "$ref": "#/components/schemas/ingest._types:DatabaseConfiguration"
+            "type": "object",
+            "properties": {
+              "name": {
+                "$ref": "#/components/schemas/_types:Name"
+              }
+            },
+            "required": [
+              "name"
+            ]
           },
           {
             "type": "object",
@@ -70777,8 +70785,16 @@
               },
               "local": {
                 "$ref": "#/components/schemas/ingest._types:Local"
+              },
+              "maxmind": {
+                "$ref": "#/components/schemas/ingest._types:Maxmind"
+              },
+              "ipinfo": {
+                "$ref": "#/components/schemas/ingest._types:Ipinfo"
               }
-            }
+            },
+            "minProperties": 1,
+            "maxProperties": 1
           }
         ]
       },
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index 0747b2fb73..11646af5c6 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -6514,7 +6514,7 @@
       },
       "delete": {
         "tags": [
-          "indices"
+          "data stream"
         ],
         "summary": "Delete data streams",
         "description": "Deletes one or more data streams and their backing indices.",
@@ -7064,7 +7064,7 @@
     "/{index}/_lifecycle/explain": {
       "get": {
         "tags": [
-          "indices"
+          "data stream"
         ],
         "summary": "Get the status for a data stream lifecycle",
         "description": "Get information about an index or data stream's current data stream lifecycle status, such as time since index creation, time since rollover, the lifecycle configuration managing the index, or any errors encountered during lifecycle execution.",
@@ -7267,7 +7267,7 @@
       },
       "put": {
         "tags": [
-          "indices"
+          "data stream"
         ],
         "summary": "Update data stream lifecycles",
         "description": "Update the data stream lifecycle of the specified data streams.",
diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json
index 3220c6a119..2184bd1896 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -3032,6 +3032,7 @@
         }
       },
       "description": "Delete data streams.\nDeletes one or more data streams and their backing indices.",
+      "docTag": "data stream",
       "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
       "name": "indices.delete_data_stream",
       "privileges": {
@@ -3221,6 +3222,7 @@
         }
       },
       "description": "Get the status for a data stream lifecycle.\nGet information about an index or data stream's current data stream lifecycle status, such as time since index creation, time since rollover, the lifecycle configuration managing the index, or any errors encountered during lifecycle execution.",
+      "docTag": "data stream",
       "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/data-streams-explain-lifecycle.html",
       "name": "indices.explain_data_lifecycle",
       "request": {
@@ -3702,6 +3704,7 @@
         }
       },
       "description": "Update data stream lifecycles.\nUpdate the data stream lifecycle of the specified data streams.",
+      "docTag": "data stream",
       "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams-put-lifecycle.html",
       "name": "indices.put_data_lifecycle",
       "request": {
@@ -20646,7 +20649,7 @@
           }
         }
       ],
-      "specLocation": "indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts#L24-L51"
+      "specLocation": "indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts#L24-L52"
     },
     {
       "body": {
@@ -21105,7 +21108,7 @@
           }
         }
       ],
-      "specLocation": "indices/explain_data_lifecycle/IndicesExplainDataLifecycleRequest.ts#L24-L39"
+      "specLocation": "indices/explain_data_lifecycle/IndicesExplainDataLifecycleRequest.ts#L24-L40"
     },
     {
       "body": {
@@ -22508,7 +22511,7 @@
           }
         }
       ],
-      "specLocation": "indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts#L25-L67"
+      "specLocation": "indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts#L25-L68"
     },
     {
       "body": {
diff --git a/output/schema/schema.json b/output/schema/schema.json
index b63939ad37..308f43cf90 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -6450,6 +6450,7 @@
         }
       },
       "description": "Delete data streams.\nDeletes one or more data streams and their backing indices.",
+      "docTag": "data stream",
       "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
       "name": "indices.delete_data_stream",
       "privileges": {
@@ -6604,6 +6605,7 @@
       },
       "description": "Downsample an index.\nAggregate a time series (TSDS) index and store pre-computed statistical summaries (`min`, `max`, `sum`, `value_count` and `avg`) for each metric field grouped by a configured time interval.\nFor example, a TSDS index that contains metrics sampled every 10 seconds can be downsampled to an hourly index.\nAll documents within an hour interval are summarized and stored as a single document in the downsample index.\n\nNOTE: Only indices in a time series data stream are supported.\nNeither field nor document level security can be defined on the source index.\nThe source index must be read only (`index.blocks.write: true`).",
       "docId": "indices-downsample-data-stream",
+      "docTag": "data stream",
       "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/indices-downsample-data-stream.html",
       "name": "indices.downsample",
       "request": {
@@ -6780,6 +6782,7 @@
         }
       },
       "description": "Get the status for a data stream lifecycle.\nGet information about an index or data stream's current data stream lifecycle status, such as time since index creation, time since rollover, the lifecycle configuration managing the index, or any errors encountered during lifecycle execution.",
+      "docTag": "data stream",
       "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/data-streams-explain-lifecycle.html",
       "name": "indices.explain_data_lifecycle",
       "request": {
@@ -7444,6 +7447,7 @@
         }
       },
       "description": "Promote a data stream.\nPromote a data stream from a replicated data stream managed by cross-cluster replication (CCR) to a regular data stream.\n\nWith CCR auto following, a data stream from a remote cluster can be replicated to the local cluster.\nThese data streams can't be rolled over in the local cluster.\nThese replicated data streams roll over only if the upstream data stream rolls over.\nIn the event that the remote cluster is no longer available, the data stream in the local cluster can be promoted to a regular data stream, which allows these data streams to be rolled over in the local cluster.\n\nNOTE: When promoting a data stream, ensure the local cluster has a data stream enabled index template that matches the data stream.\nIf this is missing, the data stream will not be able to roll over until a matching index template is created.\nThis will affect the lifecycle management of the data stream and interfere with the data stream size and retention.",
+      "docTag": "data stream",
       "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
       "name": "indices.promote_data_stream",
       "request": {
@@ -7524,6 +7528,7 @@
         }
       },
       "description": "Update data stream lifecycles.\nUpdate the data stream lifecycle of the specified data streams.",
+      "docTag": "data stream",
       "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams-put-lifecycle.html",
       "name": "indices.put_data_lifecycle",
       "request": {
@@ -130559,7 +130564,7 @@
           }
         }
       ],
-      "specLocation": "indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts#L24-L51"
+      "specLocation": "indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts#L24-L52"
     },
     {
       "kind": "response",
@@ -130911,7 +130916,7 @@
         }
       ],
       "query": [],
-      "specLocation": "indices/downsample/Request.ts#L24-L51"
+      "specLocation": "indices/downsample/Request.ts#L24-L52"
     },
     {
       "kind": "response",
@@ -131496,7 +131501,7 @@
           }
         }
       ],
-      "specLocation": "indices/explain_data_lifecycle/IndicesExplainDataLifecycleRequest.ts#L24-L39"
+      "specLocation": "indices/explain_data_lifecycle/IndicesExplainDataLifecycleRequest.ts#L24-L40"
     },
     {
       "kind": "response",
@@ -134185,7 +134190,7 @@
           }
         }
       ],
-      "specLocation": "indices/promote_data_stream/IndicesPromoteDataStreamRequest.ts#L24-L50"
+      "specLocation": "indices/promote_data_stream/IndicesPromoteDataStreamRequest.ts#L24-L51"
     },
     {
       "kind": "response",
@@ -134440,7 +134445,7 @@
           }
         }
       ],
-      "specLocation": "indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts#L25-L67"
+      "specLocation": "indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts#L25-L68"
     },
     {
       "kind": "response",
@@ -143207,12 +143212,6 @@
     },
     {
       "kind": "interface",
-      "inherits": {
-        "type": {
-          "name": "DatabaseConfiguration",
-          "namespace": "ingest._types"
-        }
-      },
       "name": {
         "name": "DatabaseConfigurationFull",
         "namespace": "ingest._types"
@@ -143239,9 +143238,47 @@
               "namespace": "ingest._types"
             }
           }
+        },
+        {
+          "containerProperty": true,
+          "description": "The provider-assigned name of the IP geolocation database to download.",
+          "name": "name",
+          "required": true,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "Name",
+              "namespace": "_types"
+            }
+          }
+        },
+        {
+          "name": "maxmind",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "Maxmind",
+              "namespace": "ingest._types"
+            }
+          }
+        },
+        {
+          "name": "ipinfo",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "Ipinfo",
+              "namespace": "ingest._types"
+            }
+          }
         }
       ],
-      "specLocation": "ingest/_types/Database.ts#L39-L42"
+      "specLocation": "ingest/_types/Database.ts#L39-L53",
+      "variants": {
+        "kind": "container"
+      }
     },
     {
       "kind": "interface",
@@ -144711,7 +144748,7 @@
         "namespace": "ingest._types"
       },
       "properties": [],
-      "specLocation": "ingest/_types/Database.ts#L48-L48"
+      "specLocation": "ingest/_types/Database.ts#L59-L59"
     },
     {
       "kind": "interface",
@@ -145039,7 +145076,7 @@
           }
         }
       ],
-      "specLocation": "ingest/_types/Database.ts#L52-L54"
+      "specLocation": "ingest/_types/Database.ts#L63-L65"
     },
     {
       "kind": "interface",
@@ -145114,7 +145151,7 @@
           }
         }
       ],
-      "specLocation": "ingest/_types/Database.ts#L44-L46"
+      "specLocation": "ingest/_types/Database.ts#L55-L57"
     },
     {
       "kind": "interface",
@@ -147231,7 +147268,7 @@
         "namespace": "ingest._types"
       },
       "properties": [],
-      "specLocation": "ingest/_types/Database.ts#L50-L50"
+      "specLocation": "ingest/_types/Database.ts#L61-L61"
     },
     {
       "kind": "request",
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 785917fb11..05bed1a2f0 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -12907,9 +12907,12 @@ export interface IngestDatabaseConfiguration {
   ipinfo?: IngestIpinfo
 }
 
-export interface IngestDatabaseConfigurationFull extends IngestDatabaseConfiguration {
+export interface IngestDatabaseConfigurationFull {
   web?: IngestWeb
   local?: IngestLocal
+  name: Name
+  maxmind?: IngestMaxmind
+  ipinfo?: IngestIpinfo
 }
 
 export interface IngestDateIndexNameProcessor extends IngestProcessorBase {
diff --git a/specification/indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts b/specification/indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts
index aeaf579adc..30ae9242ab 100644
--- a/specification/indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts
+++ b/specification/indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts
@@ -28,6 +28,7 @@ import { Duration } from '@_types/Time'
  * @availability stack since=7.9.0 stability=stable
  * @availability serverless stability=stable visibility=public
  * @index_privileges delete_index
+ * @doc_tag data stream
  */
 export interface Request extends RequestBase {
   path_parts: {
diff --git a/specification/indices/downsample/Request.ts b/specification/indices/downsample/Request.ts
index 6bc6c1c4f7..520fb37ba9 100644
--- a/specification/indices/downsample/Request.ts
+++ b/specification/indices/downsample/Request.ts
@@ -34,6 +34,7 @@ import { IndexName } from '@_types/common'
  * @rest_spec_name indices.downsample
  * @availability stack since=8.5.0 stability=experimental
  * @availability serverless stability=experimental visibility=private
+ * @doc_tag data stream
  */
 export interface Request extends RequestBase {
   path_parts: {
diff --git a/specification/indices/explain_data_lifecycle/IndicesExplainDataLifecycleRequest.ts b/specification/indices/explain_data_lifecycle/IndicesExplainDataLifecycleRequest.ts
index 299f7ab3b6..476f904c04 100644
--- a/specification/indices/explain_data_lifecycle/IndicesExplainDataLifecycleRequest.ts
+++ b/specification/indices/explain_data_lifecycle/IndicesExplainDataLifecycleRequest.ts
@@ -27,6 +27,7 @@ import { Duration } from '@_types/Time'
  * @rest_spec_name indices.explain_data_lifecycle
  * @availability stack since=8.11.0 stability=stable
  * @availability serverless stability=stable visibility=public
+ * @doc_tag data stream
  */
 export interface Request extends RequestBase {
   path_parts: {
diff --git a/specification/indices/promote_data_stream/IndicesPromoteDataStreamRequest.ts b/specification/indices/promote_data_stream/IndicesPromoteDataStreamRequest.ts
index 340ddee352..6b02783dbb 100644
--- a/specification/indices/promote_data_stream/IndicesPromoteDataStreamRequest.ts
+++ b/specification/indices/promote_data_stream/IndicesPromoteDataStreamRequest.ts
@@ -35,6 +35,7 @@ import { Duration } from '@_types/Time'
  * This will affect the lifecycle management of the data stream and interfere with the data stream size and retention.
  * @rest_spec_name indices.promote_data_stream
  * @availability stack since=7.9.0 stability=stable
+ * @doc_tag data stream
  */
 export interface Request extends RequestBase {
   path_parts: {
diff --git a/specification/indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts b/specification/indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts
index 83041d7525..986c4a12d1 100644
--- a/specification/indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts
+++ b/specification/indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts
@@ -28,6 +28,7 @@ import { Duration } from '@_types/Time'
  * @rest_spec_name indices.put_data_lifecycle
  * @availability stack since=8.11.0 stability=stable
  * @availability serverless stability=stable visibility=public
+ * @doc_tag data stream
  */
 export interface Request extends RequestBase {
   path_parts: {
diff --git a/specification/ingest/_types/Database.ts b/specification/ingest/_types/Database.ts
index 3210d86da8..bb3a9e4475 100644
--- a/specification/ingest/_types/Database.ts
+++ b/specification/ingest/_types/Database.ts
@@ -36,9 +36,20 @@ export class DatabaseConfiguration {
   ipinfo?: Ipinfo
 }
 
-export class DatabaseConfigurationFull extends DatabaseConfiguration {
+/**
+ * @variants container
+ */
+export class DatabaseConfigurationFull {
   web?: Web
   local?: Local
+  /**
+   * The provider-assigned name of the IP geolocation database to download.
+   * @variant container_property
+   */
+  name: Name
+
+  maxmind?: Maxmind
+  ipinfo?: Ipinfo
 }
 
 export class Maxmind {