diff --git a/docs/overlays/elasticsearch-openapi-overlays.yaml b/docs/overlays/elasticsearch-openapi-overlays.yaml
index 6aa33a1af3..4be0ef8ad7 100644
--- a/docs/overlays/elasticsearch-openapi-overlays.yaml
+++ b/docs/overlays/elasticsearch-openapi-overlays.yaml
@@ -546,3 +546,24 @@ actions:
               examples:
                 delegatePkiResponseExample1:
                   $ref: "../../specification/security/delegate_pki/examples/200_response/SecurityDelegatePkiResponseExample1.yaml"
+## Examples for watcher
+  - target: "$.paths['/_watcher/settings']['put']"
+    description: "Add request example for update watcher settings"
+    update:
+      requestBody: 
+        content: 
+          application/json: 
+            examples:
+              updateWatcherSettingsRequestExample1: 
+                $ref: "../../specification/watcher/update_settings/examples/request/WatcherUpdateSettingsRequestExample1.yaml"
+  - target: "$.paths['/_watcher/settings']['get']"
+    description: "Add response example for get watcher settings"
+    update:
+      responses:
+        200:
+          content: 
+            application/json: 
+              examples:
+                updateWatcherSettingsRequestExample1: 
+                  $ref: "../../specification/watcher/get_settings/examples/200_response/WatcherGetSettingsResponseExample1.yaml"
+              
diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index cf7870f39b..1aa8dd9ada 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -38323,6 +38323,116 @@
         }
       }
     },
+    "/_watcher/settings": {
+      "get": {
+        "tags": [
+          "watcher"
+        ],
+        "summary": "Get Watcher index settings",
+        "description": "Get settings for the Watcher internal index (`.watches`).\nOnly a subset of settings are shown, for example `index.auto_expand_replicas` and `index.number_of_replicas`.",
+        "operationId": "watcher-get-settings",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "master_timeout",
+            "description": "The period to wait for a connection to the master node.\nIf no response is received before the timeout expires, the request fails and returns an error.",
+            "deprecated": false,
+            "schema": {
+              "$ref": "#/components/schemas/_types:Duration"
+            },
+            "style": "form"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "index": {
+                      "$ref": "#/components/schemas/indices._types:IndexSettings"
+                    }
+                  },
+                  "required": [
+                    "index"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "watcher"
+        ],
+        "summary": "Update Watcher index settings",
+        "description": "Update settings for the Watcher internal index (`.watches`).\nOnly a subset of settings can be modified.\nThis includes `index.auto_expand_replicas` and `index.number_of_replicas`.",
+        "operationId": "watcher-update-settings",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "master_timeout",
+            "description": "The period to wait for a connection to the master node.\nIf no response is received before the timeout expires, the request fails and returns an error.",
+            "deprecated": false,
+            "schema": {
+              "$ref": "#/components/schemas/_types:Duration"
+            },
+            "style": "form"
+          },
+          {
+            "in": "query",
+            "name": "timeout",
+            "description": "The period to wait for a response.\nIf no response is received before the timeout expires, the request fails and returns an error.",
+            "deprecated": false,
+            "schema": {
+              "$ref": "#/components/schemas/_types:Duration"
+            },
+            "style": "form"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "index.auto_expand_replicas": {
+                    "type": "string"
+                  },
+                  "index.number_of_replicas": {
+                    "type": "number"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "acknowledged": {
+                      "type": "boolean"
+                    }
+                  },
+                  "required": [
+                    "acknowledged"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/_watcher/_query/watches": {
       "get": {
         "tags": [
diff --git a/output/schema/schema.json b/output/schema/schema.json
index a353999155..bfd79a1a93 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -21087,15 +21087,22 @@
           "visibility": "public"
         }
       },
-      "description": "Retrieve settings for the watcher system index",
-      "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-get-settings.html",
+      "description": "Get Watcher index settings.\nGet settings for the Watcher internal index (`.watches`).\nOnly a subset of settings are shown, for example `index.auto_expand_replicas` and `index.number_of_replicas`.",
+      "docId": "watcher-api-get-settings",
+      "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-get-settings.html",
       "name": "watcher.get_settings",
-      "request": null,
+      "request": {
+        "name": "Request",
+        "namespace": "watcher.get_settings"
+      },
       "requestBodyRequired": false,
       "requestMediaType": [
         "application/json"
       ],
-      "response": null,
+      "response": {
+        "name": "Response",
+        "namespace": "watcher.get_settings"
+      },
       "responseMediaType": [
         "application/json"
       ],
@@ -21342,15 +21349,27 @@
           "visibility": "public"
         }
       },
-      "description": "Update settings for the watcher system index",
-      "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-update-settings.html",
+      "description": "Update Watcher index settings.\nUpdate settings for the Watcher internal index (`.watches`).\nOnly a subset of settings can be modified.\nThis includes `index.auto_expand_replicas` and `index.number_of_replicas`.",
+      "docId": "watcher-api-update-settings",
+      "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-update-settings.html",
       "name": "watcher.update_settings",
-      "request": null,
+      "privileges": {
+        "cluster": [
+          "manage_watcher"
+        ]
+      },
+      "request": {
+        "name": "Request",
+        "namespace": "watcher.update_settings"
+      },
       "requestBodyRequired": true,
       "requestMediaType": [
         "application/json"
       ],
-      "response": null,
+      "response": {
+        "name": "Response",
+        "namespace": "watcher.update_settings"
+      },
       "responseMediaType": [
         "application/json"
       ],
@@ -221828,6 +221847,66 @@
       ],
       "specLocation": "watcher/execute_watch/types.ts#L27-L39"
     },
+    {
+      "kind": "request",
+      "attachedBehaviors": [
+        "CommonQueryParameters"
+      ],
+      "body": {
+        "kind": "no_body"
+      },
+      "description": "Get Watcher index settings.\nGet settings for the Watcher internal index (`.watches`).\nOnly a subset of settings are shown, for example `index.auto_expand_replicas` and `index.number_of_replicas`.",
+      "inherits": {
+        "type": {
+          "name": "RequestBase",
+          "namespace": "_types"
+        }
+      },
+      "name": {
+        "name": "Request",
+        "namespace": "watcher.get_settings"
+      },
+      "path": [],
+      "query": [
+        {
+          "description": "The period to wait for a connection to the master node.\nIf no response is received before the timeout expires, the request fails and returns an error.",
+          "name": "master_timeout",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "Duration",
+              "namespace": "_types"
+            }
+          }
+        }
+      ],
+      "specLocation": "watcher/get_settings/WatcherGetSettingsRequest.ts#L23-L39"
+    },
+    {
+      "kind": "response",
+      "body": {
+        "kind": "properties",
+        "properties": [
+          {
+            "name": "index",
+            "required": true,
+            "type": {
+              "kind": "instance_of",
+              "type": {
+                "name": "IndexSettings",
+                "namespace": "indices._types"
+              }
+            }
+          }
+        ]
+      },
+      "name": {
+        "name": "Response",
+        "namespace": "watcher.get_settings"
+      },
+      "specLocation": "watcher/get_settings/WatcherGetSettingsResponse.ts#L22-L26"
+    },
     {
       "kind": "request",
       "attachedBehaviors": [
@@ -222809,6 +222888,102 @@
       },
       "specLocation": "watcher/stop/WatcherStopResponse.ts#L22-L24"
     },
+    {
+      "kind": "request",
+      "attachedBehaviors": [
+        "CommonQueryParameters"
+      ],
+      "body": {
+        "kind": "properties",
+        "properties": [
+          {
+            "name": "index.auto_expand_replicas",
+            "required": false,
+            "type": {
+              "kind": "instance_of",
+              "type": {
+                "name": "string",
+                "namespace": "_builtins"
+              }
+            }
+          },
+          {
+            "name": "index.number_of_replicas",
+            "required": false,
+            "type": {
+              "kind": "instance_of",
+              "type": {
+                "name": "integer",
+                "namespace": "_types"
+              }
+            }
+          }
+        ]
+      },
+      "description": "Update Watcher index settings.\nUpdate settings for the Watcher internal index (`.watches`).\nOnly a subset of settings can be modified.\nThis includes `index.auto_expand_replicas` and `index.number_of_replicas`.",
+      "inherits": {
+        "type": {
+          "name": "RequestBase",
+          "namespace": "_types"
+        }
+      },
+      "name": {
+        "name": "Request",
+        "namespace": "watcher.update_settings"
+      },
+      "path": [],
+      "query": [
+        {
+          "description": "The period to wait for a connection to the master node.\nIf no response is received before the timeout expires, the request fails and returns an error.",
+          "name": "master_timeout",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "Duration",
+              "namespace": "_types"
+            }
+          }
+        },
+        {
+          "description": "The period to wait for a response.\nIf no response is received before the timeout expires, the request fails and returns an error.",
+          "name": "timeout",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "Duration",
+              "namespace": "_types"
+            }
+          }
+        }
+      ],
+      "specLocation": "watcher/update_settings/WatcherUpdateSettingsRequest.ts#L24-L52"
+    },
+    {
+      "kind": "response",
+      "body": {
+        "kind": "properties",
+        "properties": [
+          {
+            "name": "acknowledged",
+            "required": true,
+            "type": {
+              "kind": "instance_of",
+              "type": {
+                "name": "boolean",
+                "namespace": "_builtins"
+              }
+            }
+          }
+        ]
+      },
+      "name": {
+        "name": "Response",
+        "namespace": "watcher.update_settings"
+      },
+      "specLocation": "watcher/update_settings/WatcherUpdateSettingsResponse.ts#L20-L24"
+    },
     {
       "kind": "interface",
       "name": {
diff --git a/output/schema/validation-errors.json b/output/schema/validation-errors.json
index 2aa021caef..94ec3dafb2 100644
--- a/output/schema/validation-errors.json
+++ b/output/schema/validation-errors.json
@@ -431,18 +431,6 @@
         "interface definition watcher._types:TriggerEventContainer - Property schedule is a single-variant and must be required"
       ]
     },
-    "watcher.get_settings": {
-      "request": [
-        "Missing request & response"
-      ],
-      "response": []
-    },
-    "watcher.update_settings": {
-      "request": [
-        "Missing request & response"
-      ],
-      "response": []
-    },
     "xpack.info": {
       "request": [
         "Request: query parameter 'human' does not exist in the json spec",
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index aa2f6454bd..a0f936887c 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -21084,6 +21084,14 @@ export interface WatcherExecuteWatchWatchRecord {
   status?: WatcherWatchStatus
 }
 
+export interface WatcherGetSettingsRequest extends RequestBase {
+  master_timeout?: Duration
+}
+
+export interface WatcherGetSettingsResponse {
+  index: IndicesIndexSettings
+}
+
 export interface WatcherGetWatchRequest extends RequestBase {
   id: Name
 }
@@ -21187,6 +21195,19 @@ export interface WatcherStopRequest extends RequestBase {
 
 export type WatcherStopResponse = AcknowledgedResponseBase
 
+export interface WatcherUpdateSettingsRequest extends RequestBase {
+  master_timeout?: Duration
+  timeout?: Duration
+  body?: {
+    'index.auto_expand_replicas'?: string
+    'index.number_of_replicas'?: integer
+  }
+}
+
+export interface WatcherUpdateSettingsResponse {
+  acknowledged: boolean
+}
+
 export interface XpackInfoBuildInformation {
   date: DateTime
   hash: string
diff --git a/specification/_doc_ids/table.csv b/specification/_doc_ids/table.csv
index 67196e7686..c2f0798ed7 100644
--- a/specification/_doc_ids/table.csv
+++ b/specification/_doc_ids/table.csv
@@ -729,10 +729,12 @@ watcher-api-activate-watch,https://www.elastic.co/guide/en/elasticsearch/referen
 watcher-api-deactivate-watch,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-deactivate-watch.html
 watcher-api-delete-watch,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-delete-watch.html
 watcher-api-execute-watch,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-execute-watch.html
+watcher-api-get-settings,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-get-settings.html
 watcher-api-get-watch,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-get-watch.html
 watcher-api-put-watch,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-put-watch.html
 watcher-api-query-watches,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-query-watches.html
 watcher-api-start,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-start.html
 watcher-api-stats,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-stats.html
 watcher-api-stop,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-stop.html
+watcher-api-update-settings,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/watcher-api-update-settings.html
 xpack-rollup,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/xpack-rollup.html
diff --git a/specification/watcher/get_settings/WatcherGetSettingsRequest.ts b/specification/watcher/get_settings/WatcherGetSettingsRequest.ts
new file mode 100644
index 0000000000..c4903cdc47
--- /dev/null
+++ b/specification/watcher/get_settings/WatcherGetSettingsRequest.ts
@@ -0,0 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { RequestBase } from '@_types/Base'
+import { Duration } from '@_types/Time'
+
+/**
+ * Get Watcher index settings.
+ * Get settings for the Watcher internal index (`.watches`).
+ * Only a subset of settings are shown, for example `index.auto_expand_replicas` and `index.number_of_replicas`.
+ * @rest_spec_name watcher.get_settings
+ * @availability stack stability=stable visibility=public
+ * @doc_id watcher-api-get-settings
+ */
+export interface Request extends RequestBase {
+  query_parameters: {
+    /**
+     * The period to wait for a connection to the master node.
+     * If no response is received before the timeout expires, the request fails and returns an error.
+     */
+    master_timeout?: Duration
+  }
+}
diff --git a/specification/watcher/get_settings/WatcherGetSettingsResponse.ts b/specification/watcher/get_settings/WatcherGetSettingsResponse.ts
new file mode 100644
index 0000000000..a0e7aa5e1d
--- /dev/null
+++ b/specification/watcher/get_settings/WatcherGetSettingsResponse.ts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IndexSettings } from '@indices/_types/IndexSettings'
+
+export class Response {
+  body: {
+    index: IndexSettings
+  }
+}
diff --git a/specification/watcher/get_settings/examples/200_response/WatcherGetSettingsResponseExample1.yaml b/specification/watcher/get_settings/examples/200_response/WatcherGetSettingsResponseExample1.yaml
new file mode 100644
index 0000000000..e913927cee
--- /dev/null
+++ b/specification/watcher/get_settings/examples/200_response/WatcherGetSettingsResponseExample1.yaml
@@ -0,0 +1,8 @@
+# summary:
+description: A successful response with two index settings.
+# type: response
+# response_code: 200
+value:
+  index:
+    auto_expand_replicas: 0-4
+    number_of_replicas: 0
diff --git a/specification/watcher/update_settings/WatcherUpdateSettingsRequest.ts b/specification/watcher/update_settings/WatcherUpdateSettingsRequest.ts
new file mode 100644
index 0000000000..7375d12066
--- /dev/null
+++ b/specification/watcher/update_settings/WatcherUpdateSettingsRequest.ts
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { RequestBase } from '@_types/Base'
+import { integer } from '@_types/Numeric'
+import { Duration } from '@_types/Time'
+
+/**
+ * Update Watcher index settings.
+ * Update settings for the Watcher internal index (`.watches`).
+ * Only a subset of settings can be modified.
+ * This includes `index.auto_expand_replicas` and `index.number_of_replicas`.
+ * @rest_spec_name watcher.update_settings
+ * @availability stack stability=stable visibility=public
+ * @cluster_privileges manage_watcher
+ * @doc_id watcher-api-update-settings
+ */
+export interface Request extends RequestBase {
+  query_parameters: {
+    /**
+     * The period to wait for a connection to the master node.
+     * If no response is received before the timeout expires, the request fails and returns an error.
+     */
+    master_timeout?: Duration
+    /**
+     * The period to wait for a response.
+     * If no response is received before the timeout expires, the request fails and returns an error.
+     */
+    timeout?: Duration
+  }
+  /** @codegen_name watcher_index_settings */
+  body: {
+    'index.auto_expand_replicas'?: string
+    'index.number_of_replicas'?: integer
+  }
+}
diff --git a/specification/watcher/update_settings/WatcherUpdateSettingsResponse.ts b/specification/watcher/update_settings/WatcherUpdateSettingsResponse.ts
new file mode 100644
index 0000000000..626e80c3d5
--- /dev/null
+++ b/specification/watcher/update_settings/WatcherUpdateSettingsResponse.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export class Response {
+  body: {
+    acknowledged: boolean
+  }
+}
diff --git a/specification/watcher/update_settings/examples/request/WatcherUpdateSettingsRequestExample1.yaml b/specification/watcher/update_settings/examples/request/WatcherUpdateSettingsRequestExample1.yaml
new file mode 100644
index 0000000000..fe11d57280
--- /dev/null
+++ b/specification/watcher/update_settings/examples/request/WatcherUpdateSettingsRequestExample1.yaml
@@ -0,0 +1,6 @@
+# summary:
+# description:
+# type: request
+# method_request: PUT /_watcher/settings
+value:
+  index.auto_expand_replicas: 0-4