diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 2c0f436fe341..d299fd1460bb 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -20419,6 +20419,7 @@ components:
         - times
       type: object
     CompletionCondition:
+      additionalProperties: false
       description: The definition of `CompletionCondition` object.
       properties:
         operand1:
@@ -20462,6 +20463,7 @@ components:
         - OPERATOR_IS_EMPTY
         - OPERATOR_IS_NOT_EMPTY
     CompletionGate:
+      additionalProperties: false
       description: Used to create conditions before running subsequent actions.
       properties:
         completionCondition:
@@ -36028,6 +36030,7 @@ components:
           type: integer
       type: object
     ErrorHandler:
+      additionalProperties: false
       description: Used to handle errors in an action.
       properties:
         fallbackStepName:
@@ -51951,6 +51954,7 @@ components:
         name:
           description: The `InputSchemaParameters` `name`.
           example: ""
+          minLength: 1
           type: string
         type:
           $ref: "#/components/schemas/InputSchemaParametersType"
@@ -78536,11 +78540,13 @@ components:
       properties:
         branchName:
           description: The `OutboundEdge` `branchName`.
-          example: ""
+          example: main
+          minLength: 1
           type: string
         nextStepName:
           description: The `OutboundEdge` `nextStepName`.
-          example: ""
+          example: Step2
+          minLength: 1
           type: string
       required:
         - nextStepName
@@ -79690,6 +79696,7 @@ components:
         name:
           description: The `Parameter` `name`.
           example: ""
+          minLength: 1
           type: string
         value:
           description: The `Parameter` `value`.
@@ -84923,6 +84930,7 @@ components:
         - attributes
       type: object
     ReadinessGate:
+      additionalProperties: false
       description: Used to merge multiple branches into a single branch.
       properties:
         thresholdType:
@@ -87404,6 +87412,7 @@ components:
         - data
       type: object
     RetryStrategy:
+      additionalProperties: false
       description: The definition of `RetryStrategy` object.
       properties:
         kind:
@@ -87412,6 +87421,7 @@ components:
           $ref: "#/components/schemas/RetryStrategyLinear"
       required:
         - kind
+        - linear
       type: object
     RetryStrategyKind:
       description: The definition of `RetryStrategyKind` object.
@@ -87422,17 +87432,21 @@ components:
       x-enum-varnames:
         - RETRY_STRATEGY_LINEAR
     RetryStrategyLinear:
+      additionalProperties: false
       description: The definition of `RetryStrategyLinear` object.
       properties:
         interval:
           description: The `RetryStrategyLinear` `interval`. The expected format is the number of seconds ending with an s. For example, 1 day is 86400s
           example: ""
+          pattern: ^[1-9][0-9]*s$
           type: string
         maxRetries:
           description: The `RetryStrategyLinear` `maxRetries`.
-          example: 0.0
-          format: double
-          type: number
+          example: 0
+          format: int32
+          maximum: 2147483647
+          minimum: 0
+          type: integer
       required:
         - interval
         - maxRetries
@@ -103966,7 +103980,7 @@ components:
           type: string
       type: object
     Spec:
-      description: The spec defines what the workflow does.
+      description: A complete Workflow Automation definition, including its triggers, steps, and connections.
       properties:
         annotations:
           description: "A list of annotations used in the workflow. These are like sticky notes for your workflow!"
@@ -104084,11 +104098,12 @@ components:
         - type
       type: object
     StartStepNames:
-      description: "A list of steps that run first after a trigger fires."
+      description: "Names of existing workflow steps that run first after a trigger fires."
       example:
         - ""
       items:
         description: The `StartStepNames` `items`.
+        minLength: 1
         type: string
       type: array
     State:
@@ -105364,6 +105379,7 @@ components:
         actionId:
           description: The unique identifier of an action.
           example: ""
+          minLength: 1
           type: string
         completionGate:
           $ref: "#/components/schemas/CompletionGate"
@@ -105380,9 +105396,10 @@ components:
         name:
           description: Name of the step.
           example: ""
+          minLength: 1
           type: string
         outboundEdges:
-          description: A list of subsequent actions to run.
+          description: A list of subsequent actions to run. This list is empty for a terminal step.
           items:
             $ref: "#/components/schemas/OutboundEdge"
           type: array
@@ -105398,7 +105415,9 @@ components:
         - actionId
       type: object
     StepDisplay:
-      description: The definition of `StepDisplay` object.
+      description: |-
+        The position of a step on the workflow canvas. Omit `display` from every step to use
+        automatic layout, or provide it for every step to preserve a manual layout.
       properties:
         bounds:
           $ref: "#/components/schemas/StepDisplayBounds"
@@ -119151,7 +119170,7 @@ components:
         startStepNames:
           $ref: "#/components/schemas/StartStepNames"
         workflowTrigger:
-          description: "Trigger a workflow from the Datadog UI. Only required if no other trigger exists."
+          description: "Trigger a workflow from the Datadog UI. When present, this must be the workflow's only trigger."
           type: object
       required:
         - workflowTrigger
diff --git a/services/workflow_automation/src/v2/models/APITriggerWrapper.ts b/services/workflow_automation/src/v2/models/APITriggerWrapper.ts
index f57fab017411..6a9ce3a58e03 100644
--- a/services/workflow_automation/src/v2/models/APITriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/APITriggerWrapper.ts
@@ -11,7 +11,7 @@ export class APITriggerWrapper {
    */
   "apiTrigger": APITrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/AppTriggerWrapper.ts b/services/workflow_automation/src/v2/models/AppTriggerWrapper.ts
index 62c818dc68ed..d3e0f8c4fdc3 100644
--- a/services/workflow_automation/src/v2/models/AppTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/AppTriggerWrapper.ts
@@ -9,7 +9,7 @@ export class AppTriggerWrapper {
    */
   "appTrigger": any;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/CaseTriggerWrapper.ts b/services/workflow_automation/src/v2/models/CaseTriggerWrapper.ts
index d2fde2ad3f6c..068c27a93212 100644
--- a/services/workflow_automation/src/v2/models/CaseTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/CaseTriggerWrapper.ts
@@ -11,7 +11,7 @@ export class CaseTriggerWrapper {
    */
   "caseTrigger": CaseTrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/ChangeEventTriggerWrapper.ts b/services/workflow_automation/src/v2/models/ChangeEventTriggerWrapper.ts
index 03554046131a..b2f74bab0232 100644
--- a/services/workflow_automation/src/v2/models/ChangeEventTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/ChangeEventTriggerWrapper.ts
@@ -9,7 +9,7 @@ export class ChangeEventTriggerWrapper {
    */
   "changeEventTrigger": any;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/CompletionCondition.ts b/services/workflow_automation/src/v2/models/CompletionCondition.ts
index ddc4e70be86e..da87cec85608 100644
--- a/services/workflow_automation/src/v2/models/CompletionCondition.ts
+++ b/services/workflow_automation/src/v2/models/CompletionCondition.ts
@@ -18,12 +18,6 @@ export class CompletionCondition {
    * The definition of `CompletionConditionOperator` object.
    */
   "operator": CompletionConditionOperator;
-  /**
-   * A container for additional, undeclared properties.
-   * This is a holder for any undeclared properties as specified with
-   * the 'additionalProperties' keyword in the OAS document.
-   */
-  "additionalProperties"?: { [key: string]: any };
   /**
    * @ignore
    */
@@ -47,10 +41,6 @@ export class CompletionCondition {
       type: "CompletionConditionOperator",
       required: true,
     },
-    additionalProperties: {
-      baseName: "additionalProperties",
-      type: "{ [key: string]: any; }",
-    },
   };
 
   /**
diff --git a/services/workflow_automation/src/v2/models/CompletionGate.ts b/services/workflow_automation/src/v2/models/CompletionGate.ts
index 571de3a8595a..4b9681aaf7b0 100644
--- a/services/workflow_automation/src/v2/models/CompletionGate.ts
+++ b/services/workflow_automation/src/v2/models/CompletionGate.ts
@@ -15,12 +15,6 @@ export class CompletionGate {
    * The definition of `RetryStrategy` object.
    */
   "retryStrategy": RetryStrategy;
-  /**
-   * A container for additional, undeclared properties.
-   * This is a holder for any undeclared properties as specified with
-   * the 'additionalProperties' keyword in the OAS document.
-   */
-  "additionalProperties"?: { [key: string]: any };
   /**
    * @ignore
    */
@@ -40,10 +34,6 @@ export class CompletionGate {
       type: "RetryStrategy",
       required: true,
     },
-    additionalProperties: {
-      baseName: "additionalProperties",
-      type: "{ [key: string]: any; }",
-    },
   };
 
   /**
diff --git a/services/workflow_automation/src/v2/models/DashboardTriggerWrapper.ts b/services/workflow_automation/src/v2/models/DashboardTriggerWrapper.ts
index 5cf18c9e69f2..4a61476b2ac8 100644
--- a/services/workflow_automation/src/v2/models/DashboardTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/DashboardTriggerWrapper.ts
@@ -9,7 +9,7 @@ export class DashboardTriggerWrapper {
    */
   "dashboardTrigger": any;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/DatabaseMonitoringTriggerWrapper.ts b/services/workflow_automation/src/v2/models/DatabaseMonitoringTriggerWrapper.ts
index 6b713fb8404a..afbd7e76d2e7 100644
--- a/services/workflow_automation/src/v2/models/DatabaseMonitoringTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/DatabaseMonitoringTriggerWrapper.ts
@@ -9,7 +9,7 @@ export class DatabaseMonitoringTriggerWrapper {
    */
   "databaseMonitoringTrigger": any;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/DatastoreTriggerWrapper.ts b/services/workflow_automation/src/v2/models/DatastoreTriggerWrapper.ts
index ab5f39c08161..eb3816210bb9 100644
--- a/services/workflow_automation/src/v2/models/DatastoreTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/DatastoreTriggerWrapper.ts
@@ -11,7 +11,7 @@ export class DatastoreTriggerWrapper {
    */
   "datastoreTrigger": DatastoreTrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/ErrorHandler.ts b/services/workflow_automation/src/v2/models/ErrorHandler.ts
index 49a4efc3f688..907223b879c8 100644
--- a/services/workflow_automation/src/v2/models/ErrorHandler.ts
+++ b/services/workflow_automation/src/v2/models/ErrorHandler.ts
@@ -14,12 +14,6 @@ export class ErrorHandler {
    * The definition of `RetryStrategy` object.
    */
   "retryStrategy": RetryStrategy;
-  /**
-   * A container for additional, undeclared properties.
-   * This is a holder for any undeclared properties as specified with
-   * the 'additionalProperties' keyword in the OAS document.
-   */
-  "additionalProperties"?: { [key: string]: any };
   /**
    * @ignore
    */
@@ -39,10 +33,6 @@ export class ErrorHandler {
       type: "RetryStrategy",
       required: true,
     },
-    additionalProperties: {
-      baseName: "additionalProperties",
-      type: "{ [key: string]: any; }",
-    },
   };
 
   /**
diff --git a/services/workflow_automation/src/v2/models/FormTriggerWrapper.ts b/services/workflow_automation/src/v2/models/FormTriggerWrapper.ts
index f69d30bd8290..a901ba40a8ce 100644
--- a/services/workflow_automation/src/v2/models/FormTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/FormTriggerWrapper.ts
@@ -11,7 +11,7 @@ export class FormTriggerWrapper {
    */
   "formTrigger": FormTrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/GithubWebhookTriggerWrapper.ts b/services/workflow_automation/src/v2/models/GithubWebhookTriggerWrapper.ts
index 96965c8d9dd6..9c07ca58f105 100644
--- a/services/workflow_automation/src/v2/models/GithubWebhookTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/GithubWebhookTriggerWrapper.ts
@@ -11,7 +11,7 @@ export class GithubWebhookTriggerWrapper {
    */
   "githubWebhookTrigger": GithubWebhookTrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/IncidentTriggerWrapper.ts b/services/workflow_automation/src/v2/models/IncidentTriggerWrapper.ts
index 9ec07110f18e..e86169ae7713 100644
--- a/services/workflow_automation/src/v2/models/IncidentTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/IncidentTriggerWrapper.ts
@@ -11,7 +11,7 @@ export class IncidentTriggerWrapper {
    */
   "incidentTrigger": IncidentTrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/MonitorTriggerWrapper.ts b/services/workflow_automation/src/v2/models/MonitorTriggerWrapper.ts
index 02c985c534e4..3b19c673e0d8 100644
--- a/services/workflow_automation/src/v2/models/MonitorTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/MonitorTriggerWrapper.ts
@@ -11,7 +11,7 @@ export class MonitorTriggerWrapper {
    */
   "monitorTrigger": MonitorTrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/NotebookTriggerWrapper.ts b/services/workflow_automation/src/v2/models/NotebookTriggerWrapper.ts
index aa99d41d85a3..88688b7fe853 100644
--- a/services/workflow_automation/src/v2/models/NotebookTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/NotebookTriggerWrapper.ts
@@ -9,7 +9,7 @@ export class NotebookTriggerWrapper {
    */
   "notebookTrigger": any;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/OnCallTriggerWrapper.ts b/services/workflow_automation/src/v2/models/OnCallTriggerWrapper.ts
index ae128ea82c5d..f4b3384b69ed 100644
--- a/services/workflow_automation/src/v2/models/OnCallTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/OnCallTriggerWrapper.ts
@@ -11,7 +11,7 @@ export class OnCallTriggerWrapper {
    */
   "onCallTrigger": OnCallTrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/ReadinessGate.ts b/services/workflow_automation/src/v2/models/ReadinessGate.ts
index 1e5ea2e22c44..e581f980a322 100644
--- a/services/workflow_automation/src/v2/models/ReadinessGate.ts
+++ b/services/workflow_automation/src/v2/models/ReadinessGate.ts
@@ -10,12 +10,6 @@ export class ReadinessGate {
    * The definition of `ReadinessGateThresholdType` object.
    */
   "thresholdType": ReadinessGateThresholdType;
-  /**
-   * A container for additional, undeclared properties.
-   * This is a holder for any undeclared properties as specified with
-   * the 'additionalProperties' keyword in the OAS document.
-   */
-  "additionalProperties"?: { [key: string]: any };
   /**
    * @ignore
    */
@@ -30,10 +24,6 @@ export class ReadinessGate {
       type: "ReadinessGateThresholdType",
       required: true,
     },
-    additionalProperties: {
-      baseName: "additionalProperties",
-      type: "{ [key: string]: any; }",
-    },
   };
 
   /**
diff --git a/services/workflow_automation/src/v2/models/RetryStrategy.ts b/services/workflow_automation/src/v2/models/RetryStrategy.ts
index 987404f40f4b..8fc2d81f5889 100644
--- a/services/workflow_automation/src/v2/models/RetryStrategy.ts
+++ b/services/workflow_automation/src/v2/models/RetryStrategy.ts
@@ -14,13 +14,7 @@ export class RetryStrategy {
   /**
    * The definition of `RetryStrategyLinear` object.
    */
-  "linear"?: RetryStrategyLinear;
-  /**
-   * A container for additional, undeclared properties.
-   * This is a holder for any undeclared properties as specified with
-   * the 'additionalProperties' keyword in the OAS document.
-   */
-  "additionalProperties"?: { [key: string]: any };
+  "linear": RetryStrategyLinear;
   /**
    * @ignore
    */
@@ -38,10 +32,7 @@ export class RetryStrategy {
     linear: {
       baseName: "linear",
       type: "RetryStrategyLinear",
-    },
-    additionalProperties: {
-      baseName: "additionalProperties",
-      type: "{ [key: string]: any; }",
+      required: true,
     },
   };
 
diff --git a/services/workflow_automation/src/v2/models/RetryStrategyLinear.ts b/services/workflow_automation/src/v2/models/RetryStrategyLinear.ts
index 944f92cc7d80..163a46f9854d 100644
--- a/services/workflow_automation/src/v2/models/RetryStrategyLinear.ts
+++ b/services/workflow_automation/src/v2/models/RetryStrategyLinear.ts
@@ -12,12 +12,6 @@ export class RetryStrategyLinear {
    * The `RetryStrategyLinear` `maxRetries`.
    */
   "maxRetries": number;
-  /**
-   * A container for additional, undeclared properties.
-   * This is a holder for any undeclared properties as specified with
-   * the 'additionalProperties' keyword in the OAS document.
-   */
-  "additionalProperties"?: { [key: string]: any };
   /**
    * @ignore
    */
@@ -36,11 +30,7 @@ export class RetryStrategyLinear {
       baseName: "maxRetries",
       type: "number",
       required: true,
-      format: "double",
-    },
-    additionalProperties: {
-      baseName: "additionalProperties",
-      type: "{ [key: string]: any; }",
+      format: "int32",
     },
   };
 
diff --git a/services/workflow_automation/src/v2/models/ScheduleTriggerWrapper.ts b/services/workflow_automation/src/v2/models/ScheduleTriggerWrapper.ts
index 78bfa1b158ae..6607be28938a 100644
--- a/services/workflow_automation/src/v2/models/ScheduleTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/ScheduleTriggerWrapper.ts
@@ -11,7 +11,7 @@ export class ScheduleTriggerWrapper {
    */
   "scheduleTrigger": ScheduleTrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/SecurityTriggerWrapper.ts b/services/workflow_automation/src/v2/models/SecurityTriggerWrapper.ts
index fa95a0aa827c..25a6ef6e9551 100644
--- a/services/workflow_automation/src/v2/models/SecurityTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/SecurityTriggerWrapper.ts
@@ -11,7 +11,7 @@ export class SecurityTriggerWrapper {
    */
   "securityTrigger": SecurityTrigger;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/SelfServiceTriggerWrapper.ts b/services/workflow_automation/src/v2/models/SelfServiceTriggerWrapper.ts
index 84314f7ef160..ab74cbdb7e6a 100644
--- a/services/workflow_automation/src/v2/models/SelfServiceTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/SelfServiceTriggerWrapper.ts
@@ -9,7 +9,7 @@ export class SelfServiceTriggerWrapper {
    */
   "selfServiceTrigger": any;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/SlackTriggerWrapper.ts b/services/workflow_automation/src/v2/models/SlackTriggerWrapper.ts
index 2d03c5002788..012e8be178e0 100644
--- a/services/workflow_automation/src/v2/models/SlackTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/SlackTriggerWrapper.ts
@@ -9,7 +9,7 @@ export class SlackTriggerWrapper {
    */
   "slackTrigger": any;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/SoftwareCatalogTriggerWrapper.ts b/services/workflow_automation/src/v2/models/SoftwareCatalogTriggerWrapper.ts
index 6511803ad97f..ddd37c17aa01 100644
--- a/services/workflow_automation/src/v2/models/SoftwareCatalogTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/SoftwareCatalogTriggerWrapper.ts
@@ -9,7 +9,7 @@ export class SoftwareCatalogTriggerWrapper {
    */
   "softwareCatalogTrigger": any;
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
diff --git a/services/workflow_automation/src/v2/models/Spec.ts b/services/workflow_automation/src/v2/models/Spec.ts
index 2344515a93b8..d803ff353173 100644
--- a/services/workflow_automation/src/v2/models/Spec.ts
+++ b/services/workflow_automation/src/v2/models/Spec.ts
@@ -8,7 +8,7 @@ import { Step } from "./Step";
 import { Trigger } from "./Trigger";
 
 /**
- * The spec defines what the workflow does.
+ * A complete Workflow Automation definition, including its triggers, steps, and connections.
  */
 export class Spec {
   /**
diff --git a/services/workflow_automation/src/v2/models/Step.ts b/services/workflow_automation/src/v2/models/Step.ts
index 6c53a47b3aa5..951011e1607c 100644
--- a/services/workflow_automation/src/v2/models/Step.ts
+++ b/services/workflow_automation/src/v2/models/Step.ts
@@ -24,7 +24,8 @@ export class Step {
    */
   "connectionLabel"?: string;
   /**
-   * The definition of `StepDisplay` object.
+   * The position of a step on the workflow canvas. Omit `display` from every step to use
+   * automatic layout, or provide it for every step to preserve a manual layout.
    */
   "display"?: StepDisplay;
   /**
@@ -36,7 +37,7 @@ export class Step {
    */
   "name": string;
   /**
-   * A list of subsequent actions to run.
+   * A list of subsequent actions to run. This list is empty for a terminal step.
    */
   "outboundEdges"?: Array<OutboundEdge>;
   /**
diff --git a/services/workflow_automation/src/v2/models/StepDisplay.ts b/services/workflow_automation/src/v2/models/StepDisplay.ts
index ee0e5525ec97..3a0bc65ec969 100644
--- a/services/workflow_automation/src/v2/models/StepDisplay.ts
+++ b/services/workflow_automation/src/v2/models/StepDisplay.ts
@@ -3,7 +3,8 @@ import { AttributeTypeMap } from "@datadog/datadog-api-client";
 import { StepDisplayBounds } from "./StepDisplayBounds";
 
 /**
- * The definition of `StepDisplay` object.
+ * The position of a step on the workflow canvas. Omit `display` from every step to use
+ * automatic layout, or provide it for every step to preserve a manual layout.
  */
 export class StepDisplay {
   /**
diff --git a/services/workflow_automation/src/v2/models/WorkflowDataAttributes.ts b/services/workflow_automation/src/v2/models/WorkflowDataAttributes.ts
index b88324a6902e..eff1d380de31 100644
--- a/services/workflow_automation/src/v2/models/WorkflowDataAttributes.ts
+++ b/services/workflow_automation/src/v2/models/WorkflowDataAttributes.ts
@@ -23,7 +23,7 @@ export class WorkflowDataAttributes {
    */
   "published"?: boolean;
   /**
-   * The spec defines what the workflow does.
+   * A complete Workflow Automation definition, including its triggers, steps, and connections.
    */
   "spec": Spec;
   /**
diff --git a/services/workflow_automation/src/v2/models/WorkflowDataUpdateAttributes.ts b/services/workflow_automation/src/v2/models/WorkflowDataUpdateAttributes.ts
index 1adc6063eccc..676bcd43afee 100644
--- a/services/workflow_automation/src/v2/models/WorkflowDataUpdateAttributes.ts
+++ b/services/workflow_automation/src/v2/models/WorkflowDataUpdateAttributes.ts
@@ -23,7 +23,7 @@ export class WorkflowDataUpdateAttributes {
    */
   "published"?: boolean;
   /**
-   * The spec defines what the workflow does.
+   * A complete Workflow Automation definition, including its triggers, steps, and connections.
    */
   "spec"?: Spec;
   /**
diff --git a/services/workflow_automation/src/v2/models/WorkflowListItemAttributes.ts b/services/workflow_automation/src/v2/models/WorkflowListItemAttributes.ts
index 35edc741220c..841cdf8db746 100644
--- a/services/workflow_automation/src/v2/models/WorkflowListItemAttributes.ts
+++ b/services/workflow_automation/src/v2/models/WorkflowListItemAttributes.ts
@@ -23,7 +23,7 @@ export class WorkflowListItemAttributes {
    */
   "published"?: boolean;
   /**
-   * The spec defines what the workflow does.
+   * A complete Workflow Automation definition, including its triggers, steps, and connections.
    */
   "spec"?: Spec;
   /**
diff --git a/services/workflow_automation/src/v2/models/WorkflowTriggerWrapper.ts b/services/workflow_automation/src/v2/models/WorkflowTriggerWrapper.ts
index af0bd1d97564..b74fe5dbc2b4 100644
--- a/services/workflow_automation/src/v2/models/WorkflowTriggerWrapper.ts
+++ b/services/workflow_automation/src/v2/models/WorkflowTriggerWrapper.ts
@@ -5,11 +5,11 @@ import { AttributeTypeMap } from "@datadog/datadog-api-client";
  */
 export class WorkflowTriggerWrapper {
   /**
-   * A list of steps that run first after a trigger fires.
+   * Names of existing workflow steps that run first after a trigger fires.
    */
   "startStepNames"?: Array<string>;
   /**
-   * Trigger a workflow from the Datadog UI. Only required if no other trigger exists.
+   * Trigger a workflow from the Datadog UI. When present, this must be the workflow's only trigger.
    */
   "workflowTrigger": any;
   /**