diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index 88f52ee6d1..7e61fd9894 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -85227,13 +85227,9 @@
           },
           "data_stream_options": {
             "x-state": "Generally available; Added in 8.19.0",
-            "oneOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamOptionsTemplate"
-              },
+            "allOf": [
               {
-                "nullable": true,
-                "type": "string"
+                "$ref": "#/components/schemas/indices._types.DataStreamOptions"
               }
             ]
           }
@@ -88492,67 +88488,48 @@
           "fixed_interval"
         ]
       },
-      "indices._types.DataStreamOptionsTemplate": {
-        "description": "Data stream options template contains the same information as DataStreamOptions but allows them to be set explicitly to null.",
+      "indices._types.DataStreamOptions": {
+        "description": "Data stream options contain the configuration of data stream level features for a given data stream, for example,\nthe failure store configuration.",
         "type": "object",
         "properties": {
           "failure_store": {
-            "oneOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamFailureStoreTemplate"
-              },
+            "description": "If defined, it specifies configuration for the failure store of this data stream.",
+            "allOf": [
               {
-                "nullable": true,
-                "type": "string"
+                "$ref": "#/components/schemas/indices._types.DataStreamFailureStore"
               }
             ]
           }
         }
       },
-      "indices._types.DataStreamFailureStoreTemplate": {
-        "description": "Template equivalent of DataStreamFailureStore that allows nullable values.",
+      "indices._types.DataStreamFailureStore": {
+        "description": "Data stream failure store contains the configuration of the failure store for a given data stream.",
         "type": "object",
         "properties": {
           "enabled": {
             "description": "If defined, it turns the failure store on/off (`true`/`false`) for this data stream. A data stream failure store\nthat's disabled (enabled: `false`) will redirect no new failed indices to the failure store; however, it will\nnot remove any existing data from the failure store.",
-            "default": "true",
-            "oneOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "nullable": true,
-                "type": "string"
-              }
-            ]
+            "default": true,
+            "type": "boolean"
           },
           "lifecycle": {
             "description": "If defined, it specifies the lifecycle configuration for the failure store of this data stream.",
-            "oneOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.FailureStoreLifecycleTemplate"
-              },
+            "allOf": [
               {
-                "nullable": true,
-                "type": "string"
+                "$ref": "#/components/schemas/indices._types.FailureStoreLifecycle"
               }
             ]
           }
         }
       },
-      "indices._types.FailureStoreLifecycleTemplate": {
-        "description": "Template equivalent of FailureStoreLifecycle that allows nullable values.",
+      "indices._types.FailureStoreLifecycle": {
+        "description": "The failure store lifecycle configures the data stream lifecycle configuration for failure indices.",
         "type": "object",
         "properties": {
           "data_retention": {
             "description": "If defined, every document added to this data stream will be stored at least for this time frame.\nAny time after this duration the document could be deleted.\nWhen empty, every document in this data stream will be stored indefinitely.",
-            "oneOf": [
+            "allOf": [
               {
                 "$ref": "#/components/schemas/_types.Duration"
-              },
-              {
-                "nullable": true,
-                "type": "string"
               }
             ]
           },
@@ -89276,16 +89253,18 @@
           "time_in_queue_millis"
         ]
       },
-      "indices._types.IndexState": {
+      "indices.put_index_template.IndexTemplateMapping": {
         "type": "object",
         "properties": {
           "aliases": {
+            "description": "Aliases to add.\nIf the index template includes a `data_stream` object, these are data stream aliases.\nOtherwise, these are index aliases.\nData stream aliases ignore the `index_routing`, `routing`, and `search_routing` options.",
             "type": "object",
             "additionalProperties": {
               "$ref": "#/components/schemas/indices._types.Alias"
             }
           },
           "mappings": {
+            "description": "Mapping for fields in the index.\nIf specified, this mapping can include field names, field data types, and mapping parameters.",
             "allOf": [
               {
                 "$ref": "#/components/schemas/_types.mapping.TypeMapping"
@@ -89293,33 +89272,30 @@
             ]
           },
           "settings": {
+            "description": "Configuration options for the index.",
             "allOf": [
               {
                 "$ref": "#/components/schemas/indices._types.IndexSettings"
               }
             ]
           },
-          "defaults": {
-            "description": "Default settings, included when the request's `include_default` is `true`.",
+          "lifecycle": {
+            "x-state": "Generally available; Added in 8.11.0",
             "allOf": [
               {
-                "$ref": "#/components/schemas/indices._types.IndexSettings"
+                "$ref": "#/components/schemas/indices._types.DataStreamLifecycle"
               }
             ]
           },
-          "data_stream": {
-            "allOf": [
+          "data_stream_options": {
+            "x-state": "Generally available; Added in 8.19.0",
+            "oneOf": [
               {
-                "$ref": "#/components/schemas/_types.DataStreamName"
-              }
-            ]
-          },
-          "lifecycle": {
-            "description": "Data stream lifecycle applicable if this is a data stream.",
-            "x-state": "Generally available; Added in 8.11.0",
-            "allOf": [
+                "$ref": "#/components/schemas/indices._types.DataStreamOptionsTemplate"
+              },
               {
-                "$ref": "#/components/schemas/indices._types.DataStreamLifecycle"
+                "nullable": true,
+                "type": "string"
               }
             ]
           }
@@ -89372,8 +89348,76 @@
           }
         }
       },
-      "_types.DataStreamName": {
-        "type": "string"
+      "indices._types.DataStreamOptionsTemplate": {
+        "description": "Data stream options template contains the same information as DataStreamOptions but allows them to be set explicitly to null.",
+        "type": "object",
+        "properties": {
+          "failure_store": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.DataStreamFailureStoreTemplate"
+              },
+              {
+                "nullable": true,
+                "type": "string"
+              }
+            ]
+          }
+        }
+      },
+      "indices._types.DataStreamFailureStoreTemplate": {
+        "description": "Template equivalent of DataStreamFailureStore that allows nullable values.",
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "description": "If defined, it turns the failure store on/off (`true`/`false`) for this data stream. A data stream failure store\nthat's disabled (enabled: `false`) will redirect no new failed indices to the failure store; however, it will\nnot remove any existing data from the failure store.",
+            "default": "true",
+            "oneOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "nullable": true,
+                "type": "string"
+              }
+            ]
+          },
+          "lifecycle": {
+            "description": "If defined, it specifies the lifecycle configuration for the failure store of this data stream.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.FailureStoreLifecycleTemplate"
+              },
+              {
+                "nullable": true,
+                "type": "string"
+              }
+            ]
+          }
+        }
+      },
+      "indices._types.FailureStoreLifecycleTemplate": {
+        "description": "Template equivalent of FailureStoreLifecycle that allows nullable values.",
+        "type": "object",
+        "properties": {
+          "data_retention": {
+            "description": "If defined, every document added to this data stream will be stored at least for this time frame.\nAny time after this duration the document could be deleted.\nWhen empty, every document in this data stream will be stored indefinitely.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/_types.Duration"
+              },
+              {
+                "nullable": true,
+                "type": "string"
+              }
+            ]
+          },
+          "enabled": {
+            "description": "If defined, it turns data stream lifecycle on/off (`true`/`false`) for this data stream. A data stream lifecycle\nthat's disabled (enabled: `false`) will have no effect on the data stream.",
+            "default": true,
+            "type": "boolean"
+          }
+        }
       },
       "cluster.remote_info.ClusterRemoteInfo": {
         "discriminator": {
@@ -97009,6 +97053,9 @@
           "failures"
         ]
       },
+      "_types.DataStreamName": {
+        "type": "string"
+      },
       "indices.create_from.CreateFrom": {
         "type": "object",
         "properties": {
@@ -97241,6 +97288,55 @@
           "settings"
         ]
       },
+      "indices._types.IndexState": {
+        "type": "object",
+        "properties": {
+          "aliases": {
+            "type": "object",
+            "additionalProperties": {
+              "$ref": "#/components/schemas/indices._types.Alias"
+            }
+          },
+          "mappings": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/_types.mapping.TypeMapping"
+              }
+            ]
+          },
+          "settings": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.IndexSettings"
+              }
+            ]
+          },
+          "defaults": {
+            "description": "Default settings, included when the request's `include_default` is `true`.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.IndexSettings"
+              }
+            ]
+          },
+          "data_stream": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/_types.DataStreamName"
+              }
+            ]
+          },
+          "lifecycle": {
+            "description": "Data stream lifecycle applicable if this is a data stream.",
+            "x-state": "Generally available; Added in 8.11.0",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.DataStreamLifecycle"
+              }
+            ]
+          }
+        }
+      },
       "indices.get_alias._types.IndexAliases": {
         "type": "object",
         "properties": {
@@ -97576,58 +97672,6 @@
           "name"
         ]
       },
-      "indices._types.DataStreamOptions": {
-        "description": "Data stream options contain the configuration of data stream level features for a given data stream, for example,\nthe failure store configuration.",
-        "type": "object",
-        "properties": {
-          "failure_store": {
-            "description": "If defined, it specifies configuration for the failure store of this data stream.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamFailureStore"
-              }
-            ]
-          }
-        }
-      },
-      "indices._types.DataStreamFailureStore": {
-        "description": "Data stream failure store contains the configuration of the failure store for a given data stream.",
-        "type": "object",
-        "properties": {
-          "enabled": {
-            "description": "If defined, it turns the failure store on/off (`true`/`false`) for this data stream. A data stream failure store\nthat's disabled (enabled: `false`) will redirect no new failed indices to the failure store; however, it will\nnot remove any existing data from the failure store.",
-            "default": true,
-            "type": "boolean"
-          },
-          "lifecycle": {
-            "description": "If defined, it specifies the lifecycle configuration for the failure store of this data stream.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.FailureStoreLifecycle"
-              }
-            ]
-          }
-        }
-      },
-      "indices._types.FailureStoreLifecycle": {
-        "description": "The failure store lifecycle configures the data stream lifecycle configuration for failure indices.",
-        "type": "object",
-        "properties": {
-          "data_retention": {
-            "description": "If defined, every document added to this data stream will be stored at least for this time frame.\nAny time after this duration the document could be deleted.\nWhen empty, every document in this data stream will be stored indefinitely.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/_types.Duration"
-              }
-            ]
-          },
-          "enabled": {
-            "description": "If defined, it turns data stream lifecycle on/off (`true`/`false`) for this data stream. A data stream lifecycle\nthat's disabled (enabled: `false`) will have no effect on the data stream.",
-            "default": true,
-            "type": "boolean"
-          }
-        }
-      },
       "indices.get_data_stream_settings.DataStreamSettings": {
         "type": "object",
         "properties": {
@@ -97828,13 +97872,9 @@
           },
           "data_stream_options": {
             "x-state": "Generally available; Added in 8.19.0",
-            "oneOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamOptionsTemplate"
-              },
+            "allOf": [
               {
-                "nullable": true,
-                "type": "string"
+                "$ref": "#/components/schemas/indices._types.DataStreamOptions"
               }
             ]
           }
@@ -98153,42 +98193,6 @@
           "error"
         ]
       },
-      "indices.put_index_template.IndexTemplateMapping": {
-        "type": "object",
-        "properties": {
-          "aliases": {
-            "description": "Aliases to add.\nIf the index template includes a `data_stream` object, these are data stream aliases.\nOtherwise, these are index aliases.\nData stream aliases ignore the `index_routing`, `routing`, and `search_routing` options.",
-            "type": "object",
-            "additionalProperties": {
-              "$ref": "#/components/schemas/indices._types.Alias"
-            }
-          },
-          "mappings": {
-            "description": "Mapping for fields in the index.\nIf specified, this mapping can include field names, field data types, and mapping parameters.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/_types.mapping.TypeMapping"
-              }
-            ]
-          },
-          "settings": {
-            "description": "Configuration options for the index.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.IndexSettings"
-              }
-            ]
-          },
-          "lifecycle": {
-            "x-state": "Generally available; Added in 8.11.0",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamLifecycle"
-              }
-            ]
-          }
-        }
-      },
       "indices._types.DataStreamVisibility": {
         "type": "object",
         "properties": {
@@ -146052,7 +146056,7 @@
                   "description": "The template to be applied which includes mappings, settings, or aliases configuration.",
                   "allOf": [
                     {
-                      "$ref": "#/components/schemas/indices._types.IndexState"
+                      "$ref": "#/components/schemas/indices.put_index_template.IndexTemplateMapping"
                     }
                   ]
                 },
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index bd4837ea58..88c128e4cc 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -49823,13 +49823,9 @@
           },
           "data_stream_options": {
             "x-state": "Generally available",
-            "oneOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamOptionsTemplate"
-              },
+            "allOf": [
               {
-                "nullable": true,
-                "type": "string"
+                "$ref": "#/components/schemas/indices._types.DataStreamOptions"
               }
             ]
           }
@@ -60133,67 +60129,48 @@
           "fixed_interval"
         ]
       },
-      "indices._types.DataStreamOptionsTemplate": {
-        "description": "Data stream options template contains the same information as DataStreamOptions but allows them to be set explicitly to null.",
+      "indices._types.DataStreamOptions": {
+        "description": "Data stream options contain the configuration of data stream level features for a given data stream, for example,\nthe failure store configuration.",
         "type": "object",
         "properties": {
           "failure_store": {
-            "oneOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamFailureStoreTemplate"
-              },
+            "description": "If defined, it specifies configuration for the failure store of this data stream.",
+            "allOf": [
               {
-                "nullable": true,
-                "type": "string"
+                "$ref": "#/components/schemas/indices._types.DataStreamFailureStore"
               }
             ]
           }
         }
       },
-      "indices._types.DataStreamFailureStoreTemplate": {
-        "description": "Template equivalent of DataStreamFailureStore that allows nullable values.",
+      "indices._types.DataStreamFailureStore": {
+        "description": "Data stream failure store contains the configuration of the failure store for a given data stream.",
         "type": "object",
         "properties": {
           "enabled": {
             "description": "If defined, it turns the failure store on/off (`true`/`false`) for this data stream. A data stream failure store\nthat's disabled (enabled: `false`) will redirect no new failed indices to the failure store; however, it will\nnot remove any existing data from the failure store.",
-            "default": "true",
-            "oneOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "nullable": true,
-                "type": "string"
-              }
-            ]
+            "default": true,
+            "type": "boolean"
           },
           "lifecycle": {
             "description": "If defined, it specifies the lifecycle configuration for the failure store of this data stream.",
-            "oneOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.FailureStoreLifecycleTemplate"
-              },
+            "allOf": [
               {
-                "nullable": true,
-                "type": "string"
+                "$ref": "#/components/schemas/indices._types.FailureStoreLifecycle"
               }
             ]
           }
         }
       },
-      "indices._types.FailureStoreLifecycleTemplate": {
-        "description": "Template equivalent of FailureStoreLifecycle that allows nullable values.",
+      "indices._types.FailureStoreLifecycle": {
+        "description": "The failure store lifecycle configures the data stream lifecycle configuration for failure indices.",
         "type": "object",
         "properties": {
           "data_retention": {
             "description": "If defined, every document added to this data stream will be stored at least for this time frame.\nAny time after this duration the document could be deleted.\nWhen empty, every document in this data stream will be stored indefinitely.",
-            "oneOf": [
+            "allOf": [
               {
                 "$ref": "#/components/schemas/_types.Duration"
-              },
-              {
-                "nullable": true,
-                "type": "string"
               }
             ]
           },
@@ -60517,16 +60494,18 @@
           }
         }
       },
-      "indices._types.IndexState": {
+      "indices.put_index_template.IndexTemplateMapping": {
         "type": "object",
         "properties": {
           "aliases": {
+            "description": "Aliases to add.\nIf the index template includes a `data_stream` object, these are data stream aliases.\nOtherwise, these are index aliases.\nData stream aliases ignore the `index_routing`, `routing`, and `search_routing` options.",
             "type": "object",
             "additionalProperties": {
               "$ref": "#/components/schemas/indices._types.Alias"
             }
           },
           "mappings": {
+            "description": "Mapping for fields in the index.\nIf specified, this mapping can include field names, field data types, and mapping parameters.",
             "allOf": [
               {
                 "$ref": "#/components/schemas/_types.mapping.TypeMapping"
@@ -60534,33 +60513,30 @@
             ]
           },
           "settings": {
+            "description": "Configuration options for the index.",
             "allOf": [
               {
                 "$ref": "#/components/schemas/indices._types.IndexSettings"
               }
             ]
           },
-          "defaults": {
-            "description": "Default settings, included when the request's `include_default` is `true`.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.IndexSettings"
-              }
-            ]
-          },
-          "data_stream": {
+          "lifecycle": {
+            "x-state": "Generally available",
             "allOf": [
               {
-                "$ref": "#/components/schemas/_types.DataStreamName"
+                "$ref": "#/components/schemas/indices._types.DataStreamLifecycle"
               }
             ]
           },
-          "lifecycle": {
-            "description": "Data stream lifecycle applicable if this is a data stream.",
+          "data_stream_options": {
             "x-state": "Generally available",
-            "allOf": [
+            "oneOf": [
               {
-                "$ref": "#/components/schemas/indices._types.DataStreamLifecycle"
+                "$ref": "#/components/schemas/indices._types.DataStreamOptionsTemplate"
+              },
+              {
+                "nullable": true,
+                "type": "string"
               }
             ]
           }
@@ -60613,8 +60589,76 @@
           }
         }
       },
-      "_types.DataStreamName": {
-        "type": "string"
+      "indices._types.DataStreamOptionsTemplate": {
+        "description": "Data stream options template contains the same information as DataStreamOptions but allows them to be set explicitly to null.",
+        "type": "object",
+        "properties": {
+          "failure_store": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.DataStreamFailureStoreTemplate"
+              },
+              {
+                "nullable": true,
+                "type": "string"
+              }
+            ]
+          }
+        }
+      },
+      "indices._types.DataStreamFailureStoreTemplate": {
+        "description": "Template equivalent of DataStreamFailureStore that allows nullable values.",
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "description": "If defined, it turns the failure store on/off (`true`/`false`) for this data stream. A data stream failure store\nthat's disabled (enabled: `false`) will redirect no new failed indices to the failure store; however, it will\nnot remove any existing data from the failure store.",
+            "default": "true",
+            "oneOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "nullable": true,
+                "type": "string"
+              }
+            ]
+          },
+          "lifecycle": {
+            "description": "If defined, it specifies the lifecycle configuration for the failure store of this data stream.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.FailureStoreLifecycleTemplate"
+              },
+              {
+                "nullable": true,
+                "type": "string"
+              }
+            ]
+          }
+        }
+      },
+      "indices._types.FailureStoreLifecycleTemplate": {
+        "description": "Template equivalent of FailureStoreLifecycle that allows nullable values.",
+        "type": "object",
+        "properties": {
+          "data_retention": {
+            "description": "If defined, every document added to this data stream will be stored at least for this time frame.\nAny time after this duration the document could be deleted.\nWhen empty, every document in this data stream will be stored indefinitely.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/_types.Duration"
+              },
+              {
+                "nullable": true,
+                "type": "string"
+              }
+            ]
+          },
+          "enabled": {
+            "description": "If defined, it turns data stream lifecycle on/off (`true`/`false`) for this data stream. A data stream lifecycle\nthat's disabled (enabled: `false`) will have no effect on the data stream.",
+            "default": true,
+            "type": "boolean"
+          }
+        }
       },
       "_types.Result": {
         "type": "string",
@@ -63093,6 +63137,9 @@
           "type"
         ]
       },
+      "_types.DataStreamName": {
+        "type": "string"
+      },
       "_types.IndicesResponseBase": {
         "allOf": [
           {
@@ -63225,6 +63272,55 @@
           "settings"
         ]
       },
+      "indices._types.IndexState": {
+        "type": "object",
+        "properties": {
+          "aliases": {
+            "type": "object",
+            "additionalProperties": {
+              "$ref": "#/components/schemas/indices._types.Alias"
+            }
+          },
+          "mappings": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/_types.mapping.TypeMapping"
+              }
+            ]
+          },
+          "settings": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.IndexSettings"
+              }
+            ]
+          },
+          "defaults": {
+            "description": "Default settings, included when the request's `include_default` is `true`.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.IndexSettings"
+              }
+            ]
+          },
+          "data_stream": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/_types.DataStreamName"
+              }
+            ]
+          },
+          "lifecycle": {
+            "description": "Data stream lifecycle applicable if this is a data stream.",
+            "x-state": "Generally available",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/indices._types.DataStreamLifecycle"
+              }
+            ]
+          }
+        }
+      },
       "indices.get_alias._types.IndexAliases": {
         "type": "object",
         "properties": {
@@ -63534,58 +63630,6 @@
           "name"
         ]
       },
-      "indices._types.DataStreamOptions": {
-        "description": "Data stream options contain the configuration of data stream level features for a given data stream, for example,\nthe failure store configuration.",
-        "type": "object",
-        "properties": {
-          "failure_store": {
-            "description": "If defined, it specifies configuration for the failure store of this data stream.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamFailureStore"
-              }
-            ]
-          }
-        }
-      },
-      "indices._types.DataStreamFailureStore": {
-        "description": "Data stream failure store contains the configuration of the failure store for a given data stream.",
-        "type": "object",
-        "properties": {
-          "enabled": {
-            "description": "If defined, it turns the failure store on/off (`true`/`false`) for this data stream. A data stream failure store\nthat's disabled (enabled: `false`) will redirect no new failed indices to the failure store; however, it will\nnot remove any existing data from the failure store.",
-            "default": true,
-            "type": "boolean"
-          },
-          "lifecycle": {
-            "description": "If defined, it specifies the lifecycle configuration for the failure store of this data stream.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.FailureStoreLifecycle"
-              }
-            ]
-          }
-        }
-      },
-      "indices._types.FailureStoreLifecycle": {
-        "description": "The failure store lifecycle configures the data stream lifecycle configuration for failure indices.",
-        "type": "object",
-        "properties": {
-          "data_retention": {
-            "description": "If defined, every document added to this data stream will be stored at least for this time frame.\nAny time after this duration the document could be deleted.\nWhen empty, every document in this data stream will be stored indefinitely.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/_types.Duration"
-              }
-            ]
-          },
-          "enabled": {
-            "description": "If defined, it turns data stream lifecycle on/off (`true`/`false`) for this data stream. A data stream lifecycle\nthat's disabled (enabled: `false`) will have no effect on the data stream.",
-            "default": true,
-            "type": "boolean"
-          }
-        }
-      },
       "indices.get_data_stream_settings.DataStreamSettings": {
         "type": "object",
         "properties": {
@@ -63752,13 +63796,9 @@
           },
           "data_stream_options": {
             "x-state": "Generally available",
-            "oneOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamOptionsTemplate"
-              },
+            "allOf": [
               {
-                "nullable": true,
-                "type": "string"
+                "$ref": "#/components/schemas/indices._types.DataStreamOptions"
               }
             ]
           }
@@ -63950,42 +63990,6 @@
           "error"
         ]
       },
-      "indices.put_index_template.IndexTemplateMapping": {
-        "type": "object",
-        "properties": {
-          "aliases": {
-            "description": "Aliases to add.\nIf the index template includes a `data_stream` object, these are data stream aliases.\nOtherwise, these are index aliases.\nData stream aliases ignore the `index_routing`, `routing`, and `search_routing` options.",
-            "type": "object",
-            "additionalProperties": {
-              "$ref": "#/components/schemas/indices._types.Alias"
-            }
-          },
-          "mappings": {
-            "description": "Mapping for fields in the index.\nIf specified, this mapping can include field names, field data types, and mapping parameters.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/_types.mapping.TypeMapping"
-              }
-            ]
-          },
-          "settings": {
-            "description": "Configuration options for the index.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.IndexSettings"
-              }
-            ]
-          },
-          "lifecycle": {
-            "x-state": "Generally available",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/indices._types.DataStreamLifecycle"
-              }
-            ]
-          }
-        }
-      },
       "indices._types.DataStreamVisibility": {
         "type": "object",
         "properties": {
@@ -88230,7 +88234,7 @@
                   "description": "The template to be applied which includes mappings, settings, or aliases configuration.",
                   "allOf": [
                     {
-                      "$ref": "#/components/schemas/indices._types.IndexState"
+                      "$ref": "#/components/schemas/indices.put_index_template.IndexTemplateMapping"
                     }
                   ]
                 },
diff --git a/output/schema/schema.json b/output/schema/schema.json
index 2a4370eebb..d00142765c 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -124153,23 +124153,11 @@
           "name": "data_stream_options",
           "required": false,
           "type": {
-            "kind": "union_of",
-            "items": [
-              {
-                "kind": "instance_of",
-                "type": {
-                  "name": "DataStreamOptionsTemplate",
-                  "namespace": "indices._types"
-                }
-              },
-              {
-                "kind": "instance_of",
-                "type": {
-                  "name": "null",
-                  "namespace": "_builtins"
-                }
-              }
-            ]
+            "kind": "instance_of",
+            "type": {
+              "name": "DataStreamOptions",
+              "namespace": "indices._types"
+            }
           }
         }
       ],
@@ -127304,8 +127292,8 @@
             "type": {
               "kind": "instance_of",
               "type": {
-                "name": "IndexState",
-                "namespace": "indices._types"
+                "name": "IndexTemplateMapping",
+                "namespace": "indices.put_index_template"
               }
             }
           },
@@ -151926,23 +151914,11 @@
           "name": "data_stream_options",
           "required": false,
           "type": {
-            "kind": "union_of",
-            "items": [
-              {
-                "kind": "instance_of",
-                "type": {
-                  "name": "DataStreamOptionsTemplate",
-                  "namespace": "indices._types"
-                }
-              },
-              {
-                "kind": "instance_of",
-                "type": {
-                  "name": "null",
-                  "namespace": "_builtins"
-                }
-              }
-            ]
+            "kind": "instance_of",
+            "type": {
+              "name": "DataStreamOptions",
+              "namespace": "indices._types"
+            }
           }
         }
       ],
@@ -163330,9 +163306,41 @@
               "namespace": "indices._types"
             }
           }
+        },
+        {
+          "availability": {
+            "serverless": {
+              "stability": "stable"
+            },
+            "stack": {
+              "since": "8.19.0",
+              "stability": "stable"
+            }
+          },
+          "name": "data_stream_options",
+          "required": false,
+          "type": {
+            "kind": "union_of",
+            "items": [
+              {
+                "kind": "instance_of",
+                "type": {
+                  "name": "DataStreamOptionsTemplate",
+                  "namespace": "indices._types"
+                }
+              },
+              {
+                "kind": "instance_of",
+                "type": {
+                  "name": "null",
+                  "namespace": "_builtins"
+                }
+              }
+            ]
+          }
         }
       ],
-      "specLocation": "indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L163-L185"
+      "specLocation": "indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L164-L191"
     },
     {
       "kind": "request",
@@ -163603,7 +163611,7 @@
           }
         }
       ],
-      "specLocation": "indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L37-L161"
+      "specLocation": "indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L38-L162"
     },
     {
       "kind": "response",
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 23a5061e4c..fc051d9deb 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -9594,7 +9594,7 @@ export interface ClusterComponentTemplateSummary {
   mappings?: MappingTypeMapping
   aliases?: Record<string, IndicesAliasDefinition>
   lifecycle?: IndicesDataStreamLifecycleWithRollover
-  data_stream_options?: IndicesDataStreamOptionsTemplate | null
+  data_stream_options?: IndicesDataStreamOptions
 }
 
 export interface ClusterAllocationExplainAllocationDecision {
@@ -9877,7 +9877,7 @@ export interface ClusterPutComponentTemplateRequest extends RequestBase {
   cause?: string
   master_timeout?: Duration
   body?: {
-    template: IndicesIndexState
+    template: IndicesPutIndexTemplateIndexTemplateMapping
     version?: VersionNumber
     _meta?: Metadata
     deprecated?: boolean
@@ -12218,7 +12218,7 @@ export interface IndicesIndexTemplateSummary {
   mappings?: MappingTypeMapping
   settings?: IndicesIndexSettings
   lifecycle?: IndicesDataStreamLifecycleWithRollover
-  data_stream_options?: IndicesDataStreamOptionsTemplate | null
+  data_stream_options?: IndicesDataStreamOptions
 }
 
 export interface IndicesIndexVersioning {
@@ -13248,6 +13248,7 @@ export interface IndicesPutIndexTemplateIndexTemplateMapping {
   mappings?: MappingTypeMapping
   settings?: IndicesIndexSettings
   lifecycle?: IndicesDataStreamLifecycle
+  data_stream_options?: IndicesDataStreamOptionsTemplate | null
 }
 
 export interface IndicesPutIndexTemplateRequest extends RequestBase {
diff --git a/specification/cluster/_types/ComponentTemplate.ts b/specification/cluster/_types/ComponentTemplate.ts
index 2c9c497157..0e9b0cb1c0 100644
--- a/specification/cluster/_types/ComponentTemplate.ts
+++ b/specification/cluster/_types/ComponentTemplate.ts
@@ -21,7 +21,7 @@ import { IndexName, Metadata, Name, VersionNumber } from '@_types/common'
 import { TypeMapping } from '@_types/mapping/TypeMapping'
 import { AliasDefinition } from '@indices/_types/AliasDefinition'
 import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
-import { DataStreamOptionsTemplate } from '@indices/_types/DataStreamOptions'
+import { DataStreamOptions } from '@indices/_types/DataStreamOptions'
 import { IndexSettings } from '@indices/_types/IndexSettings'
 import { Dictionary } from '@spec_utils/Dictionary'
 
@@ -57,5 +57,5 @@ export class ComponentTemplateSummary {
    * @availability stack since=8.19.0 stability=stable
    * @availability serverless stability=stable
    */
-  data_stream_options?: DataStreamOptionsTemplate | null
+  data_stream_options?: DataStreamOptions
 }
diff --git a/specification/cluster/put_component_template/ClusterPutComponentTemplateRequest.ts b/specification/cluster/put_component_template/ClusterPutComponentTemplateRequest.ts
index 1095dcfd44..4021331a24 100644
--- a/specification/cluster/put_component_template/ClusterPutComponentTemplateRequest.ts
+++ b/specification/cluster/put_component_template/ClusterPutComponentTemplateRequest.ts
@@ -20,7 +20,7 @@
 import { RequestBase } from '@_types/Base'
 import { Metadata, Name, VersionNumber } from '@_types/common'
 import { Duration } from '@_types/Time'
-import { IndexState } from '@indices/_types/IndexState'
+import { IndexTemplateMapping } from '@indices/put_index_template/IndicesPutIndexTemplateRequest'
 
 /**
  * Create or update a component template.
@@ -88,7 +88,7 @@ export interface Request extends RequestBase {
     /**
      * The template to be applied which includes mappings, settings, or aliases configuration.
      */
-    template: IndexState
+    template: IndexTemplateMapping
     /**
      * Version number used to manage component templates externally.
      * This number isn't automatically generated or incremented by Elasticsearch.
diff --git a/specification/indices/_types/IndexTemplate.ts b/specification/indices/_types/IndexTemplate.ts
index 11bc360164..6a8ef164e2 100644
--- a/specification/indices/_types/IndexTemplate.ts
+++ b/specification/indices/_types/IndexTemplate.ts
@@ -21,7 +21,7 @@ import { IndexName, Metadata, Name, Names, VersionNumber } from '@_types/common'
 import { TypeMapping } from '@_types/mapping/TypeMapping'
 import { long } from '@_types/Numeric'
 import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
-import { DataStreamOptionsTemplate } from '@indices/_types/DataStreamOptions'
+import { DataStreamOptions } from '@indices/_types/DataStreamOptions'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { Alias } from './Alias'
 import { IndexSettings } from './IndexSettings'
@@ -120,5 +120,5 @@ export class IndexTemplateSummary {
    * @availability stack since=8.19.0 stability=stable
    * @availability serverless stability=stable
    */
-  data_stream_options?: DataStreamOptionsTemplate | null
+  data_stream_options?: DataStreamOptions
 }
diff --git a/specification/indices/put_index_template/IndicesPutIndexTemplateRequest.ts b/specification/indices/put_index_template/IndicesPutIndexTemplateRequest.ts
index f41b2fc796..4134d8b91a 100644
--- a/specification/indices/put_index_template/IndicesPutIndexTemplateRequest.ts
+++ b/specification/indices/put_index_template/IndicesPutIndexTemplateRequest.ts
@@ -31,6 +31,7 @@ import { Duration } from '@_types/Time'
 import { Alias } from '@indices/_types/Alias'
 import { DataStreamVisibility } from '@indices/_types/DataStream'
 import { DataStreamLifecycle } from '@indices/_types/DataStreamLifecycle'
+import { DataStreamOptionsTemplate } from '@indices/_types/DataStreamOptions'
 import { IndexSettings } from '@indices/_types/IndexSettings'
 import { Dictionary } from '@spec_utils/Dictionary'
 
@@ -182,4 +183,9 @@ export class IndexTemplateMapping {
    * @availability serverless stability=stable
    */
   lifecycle?: DataStreamLifecycle
+  /**
+   * @availability stack since=8.19.0 stability=stable
+   * @availability serverless stability=stable
+   */
+  data_stream_options?: DataStreamOptionsTemplate | null
 }