diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index e8790871ff0..ca5c6409195 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -36980,7 +36980,11 @@ components:
         attributes:
           $ref: "#/components/schemas/FlakyTestAttributes"
         id:
-          description: Test's ID. This ID is the hash of the test's Fully Qualified Name and Git repository ID. On the Test Runs UI it is the same as the `test_fingerprint_fqn` tag.
+          description: |-
+            Test's ID. This ID is the hash of the test's Fully Qualified Name and Git repository ID. It is the
+            value of the `@test.fingerprint_fqn` facet on test events, which you can search on in the Test
+            Optimization Explorer to locate a specific test. To filter search results by this ID, use the
+            `fingerprint_fqn` search key.
           type: string
         type:
           $ref: "#/components/schemas/FlakyTestType"
@@ -37362,6 +37366,9 @@ components:
             - `@git.branch`
             - `@test.codeowners`
             - `env`
+            - `fingerprint_fqn`
+
+            Use `fingerprint_fqn` to filter by a test's stable Fingerprint FQN (the same value as the test's `id`).
           example: 'flaky_test_state:active @git.repository.id_v2:"github.com/datadog/shopist"'
           type: string
       type: object
@@ -106672,7 +106679,11 @@ components:
       description: Details of what tests to update and their new attributes.
       properties:
         id:
-          description: The ID of the flaky test. This is the same ID returned by the Search flaky tests endpoint and corresponds to the test_fingerprint_fqn field in test run events.
+          description: |-
+            The ID of the flaky test. This is the same ID returned by the Search flaky tests endpoint and is the
+            value of the `@test.fingerprint_fqn` facet on test events. You can find it by searching on
+            `@test.fingerprint_fqn` in the Test Optimization Explorer, or by filtering the Search flaky tests
+            endpoint with the `fingerprint_fqn` key.
           example: 4eb1887a8adb1847
           type: string
         new_state:
@@ -106742,7 +106753,10 @@ components:
           description: Error message if the update failed.
           type: string
         id:
-          description: The ID of the flaky test from the request. This is the same ID returned by the Search flaky tests endpoint and corresponds to the test_fingerprint_fqn field in test run events.
+          description: |-
+            The ID of the flaky test from the request. This is the value of the `@test.fingerprint_fqn` facet
+            on test events, the same ID accepted by the update request and returned by the Search flaky tests
+            endpoint.
           example: 4eb1887a8adb1847
           type: string
         success:
diff --git a/src/main/java/com/datadog/api/client/v2/model/FlakyTest.java b/src/main/java/com/datadog/api/client/v2/model/FlakyTest.java
index 72b32416853..a5a9f940c06 100644
--- a/src/main/java/com/datadog/api/client/v2/model/FlakyTest.java
+++ b/src/main/java/com/datadog/api/client/v2/model/FlakyTest.java
@@ -63,8 +63,10 @@ public FlakyTest id(String id) {
   }
 
   /**
-   * Test's ID. This ID is the hash of the test's Fully Qualified Name and Git repository ID. On the
-   * Test Runs UI it is the same as the <code>test_fingerprint_fqn</code> tag.
+   * Test's ID. This ID is the hash of the test's Fully Qualified Name and Git repository ID. It is
+   * the value of the <code>@test.fingerprint_fqn</code> facet on test events, which you can search
+   * on in the Test Optimization Explorer to locate a specific test. To filter search results by
+   * this ID, use the <code>fingerprint_fqn</code> search key.
    *
    * @return id
    */
diff --git a/src/main/java/com/datadog/api/client/v2/model/FlakyTestsSearchFilter.java b/src/main/java/com/datadog/api/client/v2/model/FlakyTestsSearchFilter.java
index e4428772663..06cad7e3e6d 100644
--- a/src/main/java/com/datadog/api/client/v2/model/FlakyTestsSearchFilter.java
+++ b/src/main/java/com/datadog/api/client/v2/model/FlakyTestsSearchFilter.java
@@ -64,7 +64,10 @@ public FlakyTestsSearchFilter query(String query) {
    * UI. The supported search keys are: - <code>flaky_test_state</code> - <code>flaky_test_category
    * </code> - <code>@test.name</code> - <code>@test.suite</code> - <code>@test.module</code> -
    * <code>@test.service</code> - <code>@git.repository.id_v2</code> - <code>@git.branch</code> -
-   * <code>@test.codeowners</code> - <code>env</code>
+   * <code>@test.codeowners</code> - <code>env</code> - <code>fingerprint_fqn</code>
+   *
+   * <p>Use <code>fingerprint_fqn</code> to filter by a test's stable Fingerprint FQN (the same
+   * value as the test's <code>id</code>).
    *
    * @return query
    */
diff --git a/src/main/java/com/datadog/api/client/v2/model/UpdateFlakyTestsRequestTest.java b/src/main/java/com/datadog/api/client/v2/model/UpdateFlakyTestsRequestTest.java
index 8ef4656b714..7325a2fd860 100644
--- a/src/main/java/com/datadog/api/client/v2/model/UpdateFlakyTestsRequestTest.java
+++ b/src/main/java/com/datadog/api/client/v2/model/UpdateFlakyTestsRequestTest.java
@@ -51,7 +51,9 @@ public UpdateFlakyTestsRequestTest id(String id) {
 
   /**
    * The ID of the flaky test. This is the same ID returned by the Search flaky tests endpoint and
-   * corresponds to the test_fingerprint_fqn field in test run events.
+   * is the value of the <code>@test.fingerprint_fqn</code> facet on test events. You can find it by
+   * searching on <code>@test.fingerprint_fqn</code> in the Test Optimization Explorer, or by
+   * filtering the Search flaky tests endpoint with the <code>fingerprint_fqn</code> key.
    *
    * @return id
    */
diff --git a/src/main/java/com/datadog/api/client/v2/model/UpdateFlakyTestsResponseResult.java b/src/main/java/com/datadog/api/client/v2/model/UpdateFlakyTestsResponseResult.java
index 117ecd37583..23805616529 100644
--- a/src/main/java/com/datadog/api/client/v2/model/UpdateFlakyTestsResponseResult.java
+++ b/src/main/java/com/datadog/api/client/v2/model/UpdateFlakyTestsResponseResult.java
@@ -73,8 +73,9 @@ public UpdateFlakyTestsResponseResult id(String id) {
   }
 
   /**
-   * The ID of the flaky test from the request. This is the same ID returned by the Search flaky
-   * tests endpoint and corresponds to the test_fingerprint_fqn field in test run events.
+   * The ID of the flaky test from the request. This is the value of the <code>@test.fingerprint_fqn
+   * </code> facet on test events, the same ID accepted by the update request and returned by the
+   * Search flaky tests endpoint.
    *
    * @return id
    */