diff --git a/x-pack/plugins/security_solution/common/api/timeline/clean_draft_timelines/clean_draft_timelines_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/clean_draft_timelines/clean_draft_timelines_route.gen.ts
index b5967ab479b8c..ecdbf03058130 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/clean_draft_timelines/clean_draft_timelines_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/clean_draft_timelines/clean_draft_timelines_route.gen.ts
@@ -20,17 +20,15 @@ import { TimelineType, TimelineResponse } from '../model/components.gen';
 
 export type CleanDraftTimelinesRequestBody = z.infer<typeof CleanDraftTimelinesRequestBody>;
 export const CleanDraftTimelinesRequestBody = z.object({
-  timelineType: TimelineType.optional(),
+  timelineType: TimelineType,
 });
 export type CleanDraftTimelinesRequestBodyInput = z.input<typeof CleanDraftTimelinesRequestBody>;
 
 export type CleanDraftTimelinesResponse = z.infer<typeof CleanDraftTimelinesResponse>;
 export const CleanDraftTimelinesResponse = z.object({
   data: z.object({
-    persistTimeline: z
-      .object({
-        timeline: TimelineResponse.optional(),
-      })
-      .optional(),
+    persistTimeline: z.object({
+      timeline: TimelineResponse,
+    }),
   }),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/clean_draft_timelines/clean_draft_timelines_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/clean_draft_timelines/clean_draft_timelines_route.schema.yaml
index f5f0136e24f1a..e5e9f3ed4cfc6 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/clean_draft_timelines/clean_draft_timelines_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/clean_draft_timelines/clean_draft_timelines_route.schema.yaml
@@ -27,6 +27,7 @@ paths:
           application/json:
             schema:
               type: object
+              required: [timelineType]
               properties:
                 timelineType:
                   $ref: '../model/components.schema.yaml#/components/schemas/TimelineType'
@@ -37,17 +38,18 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
+                    required: [persistTimeline]
                     properties:
                       persistTimeline:
                         type: object
+                        required: [timeline]
                         properties:
                           timeline:
                             $ref: '../model/components.schema.yaml#/components/schemas/TimelineResponse'
-                required:
-                  - data
         '403':
           description: Indicates that the user does not have the required permissions to create a draft timeline.
           content:
diff --git a/x-pack/plugins/security_solution/common/api/timeline/create_timelines/create_timelines_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/create_timelines/create_timelines_route.gen.ts
index 8c2b2c0242a25..9b5775ca81617 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/create_timelines/create_timelines_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/create_timelines/create_timelines_route.gen.ts
@@ -38,10 +38,8 @@ export type CreateTimelinesRequestBodyInput = z.input<typeof CreateTimelinesRequ
 export type CreateTimelinesResponse = z.infer<typeof CreateTimelinesResponse>;
 export const CreateTimelinesResponse = z.object({
   data: z.object({
-    persistTimeline: z
-      .object({
-        timeline: TimelineResponse.optional(),
-      })
-      .optional(),
+    persistTimeline: z.object({
+      timeline: TimelineResponse.optional(),
+    }),
   }),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/create_timelines/create_timelines_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/create_timelines/create_timelines_route.schema.yaml
index 4ea5bc7e671a1..561ce75c84fe2 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/create_timelines/create_timelines_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/create_timelines/create_timelines_route.schema.yaml
@@ -58,17 +58,17 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
+                    required: [persistTimeline]
                     properties:
                       persistTimeline:
                         type: object
                         properties:
                           timeline:
                             $ref: '../model/components.schema.yaml#/components/schemas/TimelineResponse'
-                required:
-                  - data
         '405':
           description: Indicates that there was an error in the timeline creation.
           content:
diff --git a/x-pack/plugins/security_solution/common/api/timeline/delete_timelines/delete_timelines_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/delete_timelines/delete_timelines_route.schema.yaml
index e4062f7cd6537..51d8eb15099f4 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/delete_timelines/delete_timelines_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/delete_timelines/delete_timelines_route.schema.yaml
@@ -28,8 +28,7 @@ paths:
           application/json:
             schema:
               type: object
-              required:
-                - savedObjectIds
+              required: [savedObjectIds]
               properties:
                 savedObjectIds:
                   type: array
@@ -47,11 +46,10 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
                     properties:
                       deleteTimeline:
                         type: boolean
-                required:
-                  - data
diff --git a/x-pack/plugins/security_solution/common/api/timeline/export_timelines/export_timelines_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/export_timelines/export_timelines_route.gen.ts
index 74130284c2829..fbe1957522b75 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/export_timelines/export_timelines_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/export_timelines/export_timelines_route.gen.ts
@@ -21,7 +21,7 @@ export const ExportTimelinesRequestQuery = z.object({
   /**
    * The name of the file to export
    */
-  file_name: z.string().optional(),
+  file_name: z.string(),
 });
 export type ExportTimelinesRequestQueryInput = z.input<typeof ExportTimelinesRequestQuery>;
 
diff --git a/x-pack/plugins/security_solution/common/api/timeline/export_timelines/export_timelines_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/export_timelines/export_timelines_route.schema.yaml
index 9e529660f3323..2c0a367dc5d28 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/export_timelines/export_timelines_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/export_timelines/export_timelines_route.schema.yaml
@@ -24,6 +24,7 @@ paths:
       parameters:
         - in: query
           name: file_name
+          required: true
           schema:
             type: string
           description: The name of the file to export
diff --git a/x-pack/plugins/security_solution/common/api/timeline/get_draft_timelines/get_draft_timelines_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/get_draft_timelines/get_draft_timelines_route.gen.ts
index b94b15287292a..db0c0db421df2 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/get_draft_timelines/get_draft_timelines_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/get_draft_timelines/get_draft_timelines_route.gen.ts
@@ -20,19 +20,15 @@ import { TimelineType, TimelineResponse } from '../model/components.gen';
 
 export type GetDraftTimelinesRequestQuery = z.infer<typeof GetDraftTimelinesRequestQuery>;
 export const GetDraftTimelinesRequestQuery = z.object({
-  timelineType: TimelineType.optional(),
+  timelineType: TimelineType,
 });
 export type GetDraftTimelinesRequestQueryInput = z.input<typeof GetDraftTimelinesRequestQuery>;
 
 export type GetDraftTimelinesResponse = z.infer<typeof GetDraftTimelinesResponse>;
 export const GetDraftTimelinesResponse = z.object({
-  data: z
-    .object({
-      persistTimeline: z
-        .object({
-          timeline: TimelineResponse.optional(),
-        })
-        .optional(),
-    })
-    .optional(),
+  data: z.object({
+    persistTimeline: z.object({
+      timeline: TimelineResponse,
+    }),
+  }),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/get_draft_timelines/get_draft_timelines_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/get_draft_timelines/get_draft_timelines_route.schema.yaml
index 77c6a2a5b2f0c..c7a77af98a7f3 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/get_draft_timelines/get_draft_timelines_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/get_draft_timelines/get_draft_timelines_route.schema.yaml
@@ -21,6 +21,7 @@ paths:
       parameters:
         - in: query
           name: timelineType
+          required: true
           schema:
             $ref: '../model/components.schema.yaml#/components/schemas/TimelineType'
       responses:
@@ -30,12 +31,15 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
+                    required: [persistTimeline]
                     properties:
                       persistTimeline:
                         type: object
+                        required: [timeline]
                         properties:
                           timeline:
                             $ref: '../model/components.schema.yaml#/components/schemas/TimelineResponse'
diff --git a/x-pack/plugins/security_solution/common/api/timeline/get_notes/get_notes_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/get_notes/get_notes_route.gen.ts
index 74ced1b69ddd1..f97db62d24797 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/get_notes/get_notes_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/get_notes/get_notes_route.gen.ts
@@ -21,7 +21,7 @@ export const DocumentIds = z.union([z.array(z.string()), z.string()]);
 
 export type GetNotesRequestQuery = z.infer<typeof GetNotesRequestQuery>;
 export const GetNotesRequestQuery = z.object({
-  documentIds: DocumentIds.optional(),
+  documentIds: DocumentIds,
   page: z.coerce.number().optional(),
   perPage: z.coerce.number().optional(),
   search: z.string().nullable().optional(),
diff --git a/x-pack/plugins/security_solution/common/api/timeline/get_notes/get_notes_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/get_notes/get_notes_route.schema.yaml
index 9479cfadb3d4e..f2e58e2b4e729 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/get_notes/get_notes_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/get_notes/get_notes_route.schema.yaml
@@ -16,11 +16,13 @@ paths:
       x-codegen-enabled: true
       operationId: GetNotes
       description: Gets notes
+      summary: Get all notes for a given document.
       tags:
         - access:securitySolution
       parameters:
         - name: documentIds
           in: query
+          required: true
           schema:
             $ref: '#/components/schemas/DocumentIds'
         - name: page
diff --git a/x-pack/plugins/security_solution/common/api/timeline/get_timeline/get_timeline_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/get_timeline/get_timeline_route.gen.ts
index 3cbda37b326c2..d178b80e35b7f 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/get_timeline/get_timeline_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/get_timeline/get_timeline_route.gen.ts
@@ -34,6 +34,6 @@ export type GetTimelineRequestQueryInput = z.input<typeof GetTimelineRequestQuer
 export type GetTimelineResponse = z.infer<typeof GetTimelineResponse>;
 export const GetTimelineResponse = z.object({
   data: z.object({
-    getOneTimeline: TimelineResponse.nullable().optional(),
+    getOneTimeline: TimelineResponse.nullable(),
   }),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/get_timeline/get_timeline_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/get_timeline/get_timeline_route.schema.yaml
index 786340e782f41..9a94bafb63a76 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/get_timeline/get_timeline_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/get_timeline/get_timeline_route.schema.yaml
@@ -39,12 +39,12 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
+                    required: [getOneTimeline]
                     properties:
                       getOneTimeline:
                         $ref: '../model/components.schema.yaml#/components/schemas/TimelineResponse'
                         nullable: true
-                required:
-                  - data
diff --git a/x-pack/plugins/security_solution/common/api/timeline/get_timelines/get_timelines_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/get_timelines/get_timelines_route.gen.ts
index bf0c8e1821543..3d893309e76f9 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/get_timelines/get_timelines_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/get_timelines/get_timelines_route.gen.ts
@@ -42,12 +42,12 @@ export type GetTimelinesRequestQueryInput = z.input<typeof GetTimelinesRequestQu
 export type GetTimelinesResponse = z.infer<typeof GetTimelinesResponse>;
 export const GetTimelinesResponse = z.object({
   data: z.object({
-    timelines: z.array(TimelineResponse).optional(),
-    totalCount: z.number().optional(),
+    timelines: z.array(TimelineResponse),
+    totalCount: z.number(),
     defaultTimelineCount: z.number().optional(),
-    templateTimelineCount: z.number().optional(),
-    favoriteCount: z.number().optional(),
-    elasticTemplateTimelineCount: z.number().optional(),
-    customTemplateTimelineCount: z.number().optional(),
+    templateTimelineCount: z.number(),
+    favoriteCount: z.number(),
+    elasticTemplateTimelineCount: z.number(),
+    customTemplateTimelineCount: z.number(),
   }),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/get_timelines/get_timelines_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/get_timelines/get_timelines_route.schema.yaml
index 21b2de3fe532d..0bbc33a35aa26 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/get_timelines/get_timelines_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/get_timelines/get_timelines_route.schema.yaml
@@ -74,9 +74,20 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
+                    required:
+                      [
+                        timelines,
+                        totalCount,
+                        defaultTimelineCoun,
+                        templateTimelineCount,
+                        favoriteCount,
+                        elasticTemplateTimelineCount,
+                        customTemplateTimelineCount,
+                      ]
                     properties:
                       timelines:
                         type: array
@@ -94,8 +105,6 @@ paths:
                         type: number
                       customTemplateTimelineCount:
                         type: number
-                required:
-                  - data
         '400':
           description: Bad request. The user supplied invalid data.
           content:
diff --git a/x-pack/plugins/security_solution/common/api/timeline/import_timelines/import_timelines_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/import_timelines/import_timelines_route.gen.ts
index 7384e88bf55a8..d1bad2e075c86 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/import_timelines/import_timelines_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/import_timelines/import_timelines_route.gen.ts
@@ -22,12 +22,11 @@ export type ImportTimelinesRequestBody = z.infer<typeof ImportTimelinesRequestBo
 export const ImportTimelinesRequestBody = z.object({
   file: Readable.merge(
     z.object({
-      hapi: z
-        .object({
-          filename: z.string().optional(),
-          headers: z.object({}).optional(),
-        })
-        .optional(),
+      hapi: z.object({
+        filename: z.string(),
+        headers: z.object({}),
+        isImmutable: z.enum(['true', 'false']).optional(),
+      }),
     })
   ),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/import_timelines/import_timelines_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/import_timelines/import_timelines_route.schema.yaml
index 621475a29dcab..9925ae10322e6 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/import_timelines/import_timelines_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/import_timelines/import_timelines_route.schema.yaml
@@ -33,14 +33,21 @@ paths:
                   allOf:
                     - $ref: '../model/components.schema.yaml#/components/schemas/Readable'
                     - type: object
+                      required: [hapi]
                       properties:
                         hapi:
                           type: object
+                          required: [filename, headers]
                           properties:
                             filename:
                               type: string
                             headers:
                               type: object
+                            isImmutable:
+                              type: string
+                              enum:
+                                - 'true'
+                                - 'false'
       responses:
         '200':
           description: Indicates the import of timelines was successful.
@@ -48,11 +55,10 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     $ref: '../model/components.schema.yaml#/components/schemas/ImportTimelineResult'
-                required:
-                  - data
 
         '400':
           description: Indicates the import of timelines was unsuccessful because of an invalid file extension.
diff --git a/x-pack/plugins/security_solution/common/api/timeline/install_prepackaged_timelines/install_prepackaged_timelines_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/install_prepackaged_timelines/install_prepackaged_timelines_route.gen.ts
index 0bbb4052797b5..befdf84f496e4 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/install_prepackaged_timelines/install_prepackaged_timelines_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/install_prepackaged_timelines/install_prepackaged_timelines_route.gen.ts
@@ -22,9 +22,9 @@ export type InstallPrepackedTimelinesRequestBody = z.infer<
   typeof InstallPrepackedTimelinesRequestBody
 >;
 export const InstallPrepackedTimelinesRequestBody = z.object({
-  timelinesToInstall: z.array(ImportTimelines.nullable()).optional(),
-  timelinesToUpdate: z.array(ImportTimelines.nullable()).optional(),
-  prepackagedTimelines: z.array(SavedTimeline).optional(),
+  timelinesToInstall: z.array(ImportTimelines.nullable()),
+  timelinesToUpdate: z.array(ImportTimelines.nullable()),
+  prepackagedTimelines: z.array(SavedTimeline),
 });
 export type InstallPrepackedTimelinesRequestBodyInput = z.input<
   typeof InstallPrepackedTimelinesRequestBody
diff --git a/x-pack/plugins/security_solution/common/api/timeline/install_prepackaged_timelines/install_prepackaged_timelines_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/install_prepackaged_timelines/install_prepackaged_timelines_route.schema.yaml
index abb9d73384a92..af96bbeb9c6d2 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/install_prepackaged_timelines/install_prepackaged_timelines_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/install_prepackaged_timelines/install_prepackaged_timelines_route.schema.yaml
@@ -25,6 +25,7 @@ paths:
           application/json:
             schema:
               type: object
+              required: [timelinesToInstall, timelinesToUpdate, prepackagedTimelines]
               properties:
                 timelinesToInstall:
                   type: array
@@ -47,11 +48,10 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     $ref: '../model/components.schema.yaml#/components/schemas/ImportTimelineResult'
-                required:
-                  - data
         '500':
           description: Indicates the installation of prepackaged timelines was unsuccessful.
           content:
diff --git a/x-pack/plugins/security_solution/common/api/timeline/patch_timelines/patch_timeline_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/patch_timelines/patch_timeline_route.gen.ts
index 89c8d7540ff15..a95b87d68df3e 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/patch_timelines/patch_timeline_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/patch_timelines/patch_timeline_route.gen.ts
@@ -20,19 +20,17 @@ import { SavedTimeline, TimelineResponse } from '../model/components.gen';
 
 export type PatchTimelineRequestBody = z.infer<typeof PatchTimelineRequestBody>;
 export const PatchTimelineRequestBody = z.object({
-  timelineId: z.string().optional(),
-  version: z.string().optional(),
-  timeline: SavedTimeline.optional(),
+  timelineId: z.string().nullable(),
+  version: z.string().nullable(),
+  timeline: SavedTimeline,
 });
 export type PatchTimelineRequestBodyInput = z.input<typeof PatchTimelineRequestBody>;
 
 export type PatchTimelineResponse = z.infer<typeof PatchTimelineResponse>;
 export const PatchTimelineResponse = z.object({
   data: z.object({
-    persistTimeline: z
-      .object({
-        timeline: TimelineResponse.optional(),
-      })
-      .optional(),
+    persistTimeline: z.object({
+      timeline: TimelineResponse.optional(),
+    }),
   }),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/patch_timelines/patch_timeline_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/patch_timelines/patch_timeline_route.schema.yaml
index 590af871df204..160ef92ca1fcd 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/patch_timelines/patch_timeline_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/patch_timelines/patch_timeline_route.schema.yaml
@@ -26,11 +26,14 @@ paths:
           application/json:
             schema:
               type: object
+              required: [timelineId, version, timeline]
               properties:
                 timelineId:
                   type: string
+                  nullable: true
                 version:
                   type: string
+                  nullable: true
                 timeline:
                   $ref: '../model/components.schema.yaml#/components/schemas/SavedTimeline'
       responses:
@@ -40,17 +43,17 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
+                    required: [persistTimeline]
                     properties:
                       persistTimeline:
                         type: object
                         properties:
                           timeline:
                             $ref: '../model/components.schema.yaml#/components/schemas/TimelineResponse'
-                required:
-                  - data
         '405':
           description: Indicates that the user does not have the required access to create a draft timeline.
           content:
diff --git a/x-pack/plugins/security_solution/common/api/timeline/persist_favorite/persist_favorite_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/persist_favorite/persist_favorite_route.gen.ts
index 68174980650d2..f28483e8f0e66 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/persist_favorite/persist_favorite_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/persist_favorite/persist_favorite_route.gen.ts
@@ -20,16 +20,16 @@ import { TimelineType, FavoriteTimelineResponse } from '../model/components.gen'
 
 export type PersistFavoriteRouteRequestBody = z.infer<typeof PersistFavoriteRouteRequestBody>;
 export const PersistFavoriteRouteRequestBody = z.object({
-  timelineId: z.string().nullable().optional(),
-  templateTimelineId: z.string().nullable().optional(),
-  templateTimelineVersion: z.number().nullable().optional(),
-  timelineType: TimelineType.nullable().optional(),
+  timelineId: z.string().nullable(),
+  templateTimelineId: z.string().nullable(),
+  templateTimelineVersion: z.number().nullable(),
+  timelineType: TimelineType.nullable(),
 });
 export type PersistFavoriteRouteRequestBodyInput = z.input<typeof PersistFavoriteRouteRequestBody>;
 
 export type PersistFavoriteRouteResponse = z.infer<typeof PersistFavoriteRouteResponse>;
 export const PersistFavoriteRouteResponse = z.object({
   data: z.object({
-    persistFavorite: FavoriteTimelineResponse.optional(),
+    persistFavorite: FavoriteTimelineResponse,
   }),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/persist_favorite/persist_favorite_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/persist_favorite/persist_favorite_route.schema.yaml
index 8534cb5fa5b2b..87a9e4d21ac68 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/persist_favorite/persist_favorite_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/persist_favorite/persist_favorite_route.schema.yaml
@@ -25,6 +25,7 @@ paths:
           application/json:
             schema:
               type: object
+              required: [timelineId, templateTimelineId, templateTimelineVersion, timelineType]
               properties:
                 timelineId:
                   type: string
@@ -45,14 +46,14 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
+                    required: [persistFavorite]
                     properties:
                       persistFavorite:
                         $ref: '../model/components.schema.yaml#/components/schemas/FavoriteTimelineResponse'
-                required:
-                  - data
         '403':
           description: Indicates the user does not have the required permissions to persist the favorite status.
           content:
diff --git a/x-pack/plugins/security_solution/common/api/timeline/persist_note/persist_note_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/persist_note/persist_note_route.gen.ts
index ee9857a66b123..5cbb0464218fb 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/persist_note/persist_note_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/persist_note/persist_note_route.gen.ts
@@ -24,18 +24,19 @@ export const PersistNoteRouteRequestBody = z.object({
   overrideOwner: z.boolean().nullable().optional(),
   noteId: z.string().nullable().optional(),
   version: z.string().nullable().optional(),
+  eventIngested: z.string().nullable().optional(),
+  eventTimestamp: z.string().nullable().optional(),
+  eventDataView: z.string().nullable().optional(),
 });
 export type PersistNoteRouteRequestBodyInput = z.input<typeof PersistNoteRouteRequestBody>;
 
 export type PersistNoteRouteResponse = z.infer<typeof PersistNoteRouteResponse>;
 export const PersistNoteRouteResponse = z.object({
   data: z.object({
-    persistNote: z
-      .object({
-        code: z.number().optional(),
-        message: z.string().optional(),
-        note: Note.optional(),
-      })
-      .optional(),
+    persistNote: z.object({
+      code: z.number(),
+      message: z.string(),
+      note: Note,
+    }),
   }),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/persist_note/persist_note_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/persist_note/persist_note_route.schema.yaml
index 72fa870c5a536..e5de10d97e013 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/persist_note/persist_note_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/persist_note/persist_note_route.schema.yaml
@@ -28,8 +28,7 @@ paths:
           application/json:
             schema:
               type: object
-              required:
-                - note
+              required: [note]
               properties:
                 note:
                   $ref: '../model/components.schema.yaml#/components/schemas/BareNote'
@@ -42,6 +41,15 @@ paths:
                 version:
                   type: string
                   nullable: true
+                eventIngested:
+                  type: string
+                  nullable: true
+                eventTimestamp:
+                  type: string
+                  nullable: true
+                eventDataView:
+                  type: string
+                  nullable: true
       responses:
         '200':
           description: Indicates the note was successfully created.
@@ -49,12 +57,15 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
+                    required: [persistNote]
                     properties:
                       persistNote:
                         type: object
+                        required: [code, message, note]
                         properties:
                           code:
                             type: number
@@ -62,5 +73,3 @@ paths:
                             type: string
                           note:
                             $ref: '../model/components.schema.yaml#/components/schemas/Note'
-                required:
-                  - data
diff --git a/x-pack/plugins/security_solution/common/api/timeline/pinned_events/pinned_events_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/pinned_events/pinned_events_route.gen.ts
index 28a5093c313b1..20556779db7c4 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/pinned_events/pinned_events_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/pinned_events/pinned_events_route.gen.ts
@@ -22,7 +22,7 @@ export type PersistPinnedEventRouteRequestBody = z.infer<typeof PersistPinnedEve
 export const PersistPinnedEventRouteRequestBody = z.object({
   eventId: z.string(),
   pinnedEventId: z.string().nullable().optional(),
-  timelineId: z.string().optional(),
+  timelineId: z.string(),
 });
 export type PersistPinnedEventRouteRequestBodyInput = z.input<
   typeof PersistPinnedEventRouteRequestBody
diff --git a/x-pack/plugins/security_solution/common/api/timeline/pinned_events/pinned_events_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/pinned_events/pinned_events_route.schema.yaml
index 679418fc79232..dd16dda4f273c 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/pinned_events/pinned_events_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/pinned_events/pinned_events_route.schema.yaml
@@ -28,8 +28,7 @@ paths:
           application/json:
             schema:
               type: object
-              required:
-                - eventId
+              required: [eventId, timelineId]
               properties:
                 eventId:
                   type: string
@@ -45,9 +44,11 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
+                    required: [persistPinnedEventOnTimeline]
                     properties:
                       persistPinnedEventOnTimeline:
                         allOf:
@@ -58,5 +59,3 @@ paths:
                                 type: number
                               message:
                                 type: string
-                required:
-                  - data
diff --git a/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route.gen.ts b/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route.gen.ts
index 679b25f900306..ae72d1abdcc88 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route.gen.ts
@@ -34,6 +34,6 @@ export type ResolveTimelineRequestQueryInput = z.input<typeof ResolveTimelineReq
 export type ResolveTimelineResponse = z.infer<typeof ResolveTimelineResponse>;
 export const ResolveTimelineResponse = z.object({
   data: z.object({
-    getOneTimeline: TimelineResponse.nullable().optional(),
+    getOneTimeline: TimelineResponse,
   }),
 });
diff --git a/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route.schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route.schema.yaml
index 6c9ab13feafe7..0a25c47e97a08 100644
--- a/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route.schema.yaml
@@ -36,15 +36,14 @@ paths:
             application/json:
               schema:
                 type: object
+                required: [data]
                 properties:
                   data:
                     type: object
                     properties:
                       getOneTimeline:
-                        $ref: '../model/components.schema.yaml#/components/schemas/TimelineResponse'
-                        nullable: true
-                required:
-                  - data
+                        allOf:
+                          - $ref: '../model/components.schema.yaml#/components/schemas/TimelineResponse'
         '400':
           description: The request is missing parameters
         '404':