diff --git a/.github/vale/styles/Vocab/OpenSearch/Products/accept.txt b/.github/vale/styles/Vocab/OpenSearch/Products/accept.txt
index e4be8846456..1d80b812525 100644
--- a/.github/vale/styles/Vocab/OpenSearch/Products/accept.txt
+++ b/.github/vale/styles/Vocab/OpenSearch/Products/accept.txt
@@ -130,6 +130,7 @@ Microsoft Power BI
 Migration Assistant
 Migration Console
 Minikube
+Mustache
 Nagle
 Nagios
 NVMe
diff --git a/_search-plugins/search-relevance/query-sets.md b/_search-plugins/search-relevance/query-sets.md
index dc6481dbb3c..ccaf715b0b3 100644
--- a/_search-plugins/search-relevance/query-sets.md
+++ b/_search-plugins/search-relevance/query-sets.md
@@ -85,6 +85,7 @@ All query sets comprise one or more entries. Each entry is a JSON object contain
 | :--- | :--- | :--- |
 | `queryText` | String | The user query string. Required. |
 | `referenceAnswer` | String | The expected or correct answer to the user query. This field is used for generating judgments, especially with large language models (LLMs). Optional. |
+| Custom fields | String | Any field other than `queryText` and `referenceAnswer` is stored as a custom field in the entry. You can reference a custom field by its name as a [Mustache template variable]({{site.url}}{{site.baseurl}}/search-plugins/search-relevance/search-configurations/#using-mustache-templates) in a search configuration. Optional. |
 
 ### Basic query set example
 
@@ -102,7 +103,7 @@ A basic query set contains only the `queryText` field for each entry. It is suit
 
 ### Query set with reference answers example
 
-This format includes the `referenceAnswer` field alongside the `queryText`. It is ideal for evaluating applications designed to provide specific answers, such as chatbots or question-answering systems.
+In this format, each entry pairs a `queryText` with a `referenceAnswer`. Use it to evaluate applications that return a specific answer, such as chatbots or question-answering systems.
 
 #### Example query set with reference answers
 
@@ -114,9 +115,22 @@ This format includes the `referenceAnswer` field alongside the `queryText`. It i
 {"queryText": "When was the first iPhone released?", "referenceAnswer": "June 29, 2007"}
 ```
 
-
 The `referenceAnswer` field is particularly useful when using [LLMs to generate judgments]({{site.url}}{{site.baseurl}}/search-plugins/search-relevance/judgments/). The LLM can use the reference answer as a ground truth to compare against the retrieved search results, allowing it to accurately score the relevance of the response.
 
+### Query set with custom fields example
+
+In addition to `queryText`, each entry can include custom fields. You can reference these fields as Mustache template variables in a [search configuration]({{site.url}}{{site.baseurl}}/search-plugins/search-relevance/search-configurations/#using-mustache-templates) so that one search configuration applies different filters or parameters to each query.
+
+#### Example query set with custom fields
+
+In the following example, each entry includes a `category` custom field. If a search configuration references `{{category}}` in its query, it filters the results for each query by the `category` value in the corresponding entry:
+
+```json
+{"queryText": "phone", "category": "electronics"}
+{"queryText": "steel", "category": "materials"}
+{"queryText": "keyboard", "category": "electronics"}
+```
+
 ## Managing query sets
 
 You can retrieve or delete query sets using the following APIs.
diff --git a/_search-plugins/search-relevance/search-configurations.md b/_search-plugins/search-relevance/search-configurations.md
index f3d8abef36a..7d7fbc1b22d 100644
--- a/_search-plugins/search-relevance/search-configurations.md
+++ b/_search-plugins/search-relevance/search-configurations.md
@@ -29,7 +29,7 @@ Field | Data type |  Description
 :---  | :--- | :---
 `name` | String | The name of the search configuration.
 `description` | String | Description of the search configuration.
-`query` | Object | Defines the query in OpenSearch query DSL. Use `%SearchText%` as a placeholder for the user query. Needs to be escaped.
+`query` | Object | Defines the query in OpenSearch query DSL, provided as a JSON string with the inner quotation marks escaped (for example, `"query": "{\"query\":{\"multi_match\":{...}}}"`). Use the `%SearchText%` placeholder or [Mustache](https://mustache.github.io/) template variables (such as {% raw %}`{{queryText}}`{% endraw %}) to substitute query set values at runtime. For more information, see [Using Mustache templates](#using-mustache-templates).
 `index` | String | The target index queried by this search configuration.
 `searchPipeline` | String | Specifies an existing search pipeline. Optional.
 
@@ -45,6 +45,33 @@ PUT _plugins/_search_relevance/search_configurations
 }
 ```
 
+### Using Mustache templates
+
+Instead of the `%SearchText%` placeholder, you can use [Mustache](https://mustache.github.io/) template variables in a query. If the `query` parameter contains double curly braces ({% raw %}`{{}}`{% endraw %}), OpenSearch renders the `query` as a Mustache template; otherwise, OpenSearch substitutes the `%SearchText%` placeholder. Existing `%SearchText%` configurations continue to work unchanged.
+
+When OpenSearch renders a template, the following variables are available:
+
+- {% raw %}`{{queryText}}`{% endraw %}: The `queryText` value from the current query set entry.
+- {% raw %}`{{<field_name>}}`{% endraw %}: Any custom field from the query set entry, referenced by its field name (for example, {% raw %}`{{category}}`{% endraw %}). For more information, see [Query sets]({{site.url}}{{site.baseurl}}/search-plugins/search-relevance/query-sets/).
+
+OpenSearch automatically escapes substituted values, so query text that contains quotation marks or other special characters remains valid in JSON.
+
+Mustache partials ({% raw %}`{{>...}}`{% endraw %}) are not supported and cause the query to be rejected.
+{: .note}
+
+For example, the following request creates a search configuration that matches the user query against the `title` field and filters the results by the `category` custom field from each query set entry:
+
+```json
+PUT _plugins/_search_relevance/search_configurations
+{
+  "name": "mustache_filter",
+  "query": "{\"query\":{\"bool\":{\"must\":[{\"match\":{\"title\":\"{% raw %}{{queryText}}{% endraw %}\"}}],\"filter\":[{\"term\":{\"category\":\"{% raw %}{{category}}{% endraw %}\"}}]}}}",
+  "description": "Title match filtered by a category custom field",
+  "index": "ecommerce"
+}
+```
+{% include copy-curl.html %}
+
 ## Managing search configurations
 
 You can retrieve or delete configurations using the following APIs.