diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index bc83a152c8..7dddea0f88 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -55686,6 +55686,7 @@
           "date",
           "double",
           "geo_point",
+          "geo_shape",
           "ip",
           "keyword",
           "long",
@@ -67457,6 +67458,9 @@
               "ignore_z_value": {
                 "type": "boolean"
               },
+              "index": {
+                "type": "boolean"
+              },
               "orientation": {
                 "$ref": "#/components/schemas/_types.mapping:GeoOrientation"
               },
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index c2280de6c6..3a16d3791f 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -34740,6 +34740,7 @@
           "date",
           "double",
           "geo_point",
+          "geo_shape",
           "ip",
           "keyword",
           "long",
@@ -44048,6 +44049,9 @@
               "ignore_z_value": {
                 "type": "boolean"
               },
+              "index": {
+                "type": "boolean"
+              },
               "orientation": {
                 "$ref": "#/components/schemas/_types.mapping:GeoOrientation"
               },
diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json
index a77fb4d705..da9d2ebc7c 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -70717,6 +70717,9 @@
         {
           "name": "geo_point"
         },
+        {
+          "name": "geo_shape"
+        },
         {
           "name": "ip"
         },
@@ -70734,7 +70737,7 @@
         "name": "RuntimeFieldType",
         "namespace": "_types.mapping"
       },
-      "specLocation": "_types/mapping/RuntimeFields.ts#L62-L72"
+      "specLocation": "_types/mapping/RuntimeFields.ts#L62-L73"
     },
     {
       "kind": "interface",
@@ -90350,7 +90353,7 @@
         "name": "GeoStrategy",
         "namespace": "_types.mapping"
       },
-      "specLocation": "_types/mapping/geo.ts#L56-L59"
+      "specLocation": "_types/mapping/geo.ts#L57-L60"
     },
     {
       "kind": "enum",
@@ -93844,6 +93847,17 @@
             }
           }
         },
+        {
+          "name": "index",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "boolean",
+              "namespace": "_builtins"
+            }
+          }
+        },
         {
           "name": "orientation",
           "required": false,
@@ -93875,7 +93889,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/geo.ts#L41-L54"
+      "specLocation": "_types/mapping/geo.ts#L41-L55"
     },
     {
       "inherits": {
@@ -93932,7 +93946,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/geo.ts#L66-L71"
+      "specLocation": "_types/mapping/geo.ts#L67-L72"
     },
     {
       "description": "The `shape` data type facilitates the indexing of and searching with arbitrary `x, y` cartesian shapes such as\nrectangles and polygons.",
@@ -94003,7 +94017,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/geo.ts#L73-L85"
+      "specLocation": "_types/mapping/geo.ts#L74-L86"
     },
     {
       "inherits": {
diff --git a/output/schema/schema.json b/output/schema/schema.json
index 30b25830ad..74a19abf73 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -78104,6 +78104,17 @@
             }
           }
         },
+        {
+          "name": "index",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "boolean",
+              "namespace": "_builtins"
+            }
+          }
+        },
         {
           "name": "orientation",
           "required": false,
@@ -78135,7 +78146,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/geo.ts#L41-L54"
+      "specLocation": "_types/mapping/geo.ts#L41-L55"
     },
     {
       "kind": "enum",
@@ -78151,7 +78162,7 @@
         "name": "GeoStrategy",
         "namespace": "_types.mapping"
       },
-      "specLocation": "_types/mapping/geo.ts#L56-L59"
+      "specLocation": "_types/mapping/geo.ts#L57-L60"
     },
     {
       "kind": "interface",
@@ -79468,7 +79479,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/geo.ts#L66-L71"
+      "specLocation": "_types/mapping/geo.ts#L67-L72"
     },
     {
       "kind": "type_alias",
@@ -80271,6 +80282,9 @@
         {
           "name": "geo_point"
         },
+        {
+          "name": "geo_shape"
+        },
         {
           "name": "ip"
         },
@@ -80288,7 +80302,7 @@
         "name": "RuntimeFieldType",
         "namespace": "_types.mapping"
       },
-      "specLocation": "_types/mapping/RuntimeFields.ts#L62-L72"
+      "specLocation": "_types/mapping/RuntimeFields.ts#L62-L73"
     },
     {
       "kind": "type_alias",
@@ -80631,7 +80645,7 @@
           }
         }
       ],
-      "specLocation": "_types/mapping/geo.ts#L73-L85"
+      "specLocation": "_types/mapping/geo.ts#L74-L86"
     },
     {
       "kind": "interface",
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 4d173481b5..9bc05b0e33 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -5578,6 +5578,7 @@ export interface MappingGeoShapeProperty extends MappingDocValuesPropertyBase {
   coerce?: boolean
   ignore_malformed?: boolean
   ignore_z_value?: boolean
+  index?: boolean
   orientation?: MappingGeoOrientation
   strategy?: MappingGeoStrategy
   type: 'geo_shape'
@@ -5780,7 +5781,7 @@ export interface MappingRuntimeFieldFetchFields {
   format?: string
 }
 
-export type MappingRuntimeFieldType = 'boolean' | 'composite' | 'date' | 'double' | 'geo_point' | 'ip' | 'keyword' | 'long' | 'lookup'
+export type MappingRuntimeFieldType = 'boolean' | 'composite' | 'date' | 'double' | 'geo_point' | 'geo_shape' | 'ip' | 'keyword' | 'long' | 'lookup'
 
 export type MappingRuntimeFields = Record<Field, MappingRuntimeField>
 
diff --git a/specification/_types/mapping/RuntimeFields.ts b/specification/_types/mapping/RuntimeFields.ts
index 62160a46f7..c6bb968662 100644
--- a/specification/_types/mapping/RuntimeFields.ts
+++ b/specification/_types/mapping/RuntimeFields.ts
@@ -65,6 +65,7 @@ export enum RuntimeFieldType {
   date,
   double,
   geo_point,
+  geo_shape,
   ip,
   keyword,
   long,
diff --git a/specification/_types/mapping/geo.ts b/specification/_types/mapping/geo.ts
index d5498c4a7f..86f14f4aa0 100644
--- a/specification/_types/mapping/geo.ts
+++ b/specification/_types/mapping/geo.ts
@@ -48,6 +48,7 @@ export class GeoShapeProperty extends DocValuesPropertyBase {
   coerce?: boolean
   ignore_malformed?: boolean
   ignore_z_value?: boolean
+  index?: boolean
   orientation?: GeoOrientation
   strategy?: GeoStrategy
   type: 'geo_shape'