diff --git a/lib/validations/webhook.ts b/lib/validations/webhook.ts
index 44f433b3c1..f523c4c71e 100644
--- a/lib/validations/webhook.ts
+++ b/lib/validations/webhook.ts
@@ -1,15 +1,16 @@
 import { z } from "zod";
 
 import { _WebhookModel as Webhook } from "@calcom/prisma/zod";
-// import { WebhookTriggerEvents } from "@calcom/prisma/client";
+import { WebhookTriggerEvents } from "@calcom/prisma/client";
 
-// export const WEBHOOK_TRIGGER_EVENTS = [
-//   WebhookTriggerEvents.BOOKING_CANCELLED,
-//   WebhookTriggerEvents.BOOKING_CREATED,
-//   WebhookTriggerEvents.BOOKING_RESCHEDULED,
-// ] as ["BOOKING_CANCELLED", "BOOKING_CREATED", "BOOKING_RESCHEDULED"];
+export const WEBHOOK_TRIGGER_EVENTS = [
+  WebhookTriggerEvents.BOOKING_CANCELLED,
+  WebhookTriggerEvents.BOOKING_CREATED,
+  WebhookTriggerEvents.BOOKING_RESCHEDULED,
+] as ["BOOKING_CANCELLED", "BOOKING_CREATED", "BOOKING_RESCHEDULED"];
 
 const schemaWebhookBaseBodyParams = Webhook.pick({
+  id: true,
   userId: true,
   eventTypeId: true,
   eventTriggers: true,
@@ -20,12 +21,13 @@ const schemaWebhookBaseBodyParams = Webhook.pick({
 
 export const schemaWebhookCreateParams = z
   .object({
+    id: z.string(),
     subscriberUrl: z.string().url(),
-    eventTriggers: z.any(),
+    eventTriggers: z.enum(WEBHOOK_TRIGGER_EVENTS).array(),
     active: z.boolean(),
-//     payloadTemplate: z.string().optional().nullable(),
-//     eventTypeId: z.number().optional(),
-//     appId: z.string().optional().nullable(),
+    payloadTemplate: z.string().optional().nullable(),
+    eventTypeId: z.number().optional(),
+    appId: z.string().optional().nullable(),
   })
   .strict();
 
@@ -36,8 +38,7 @@ export const schemaWebhookCreateBodyParams = schemaWebhookBaseBodyParams.merge(
 export const schemaWebhookEditBodyParams = schemaWebhookBaseBodyParams.merge(
   z.object({
     payloadTemplate: z.string().optional(),
-    /** @todo: don't use 'any' here and validate eventTriggers proper */
-    eventTriggers: z.any().optional(),
+    eventTriggers: z.enum(WEBHOOK_TRIGGER_EVENTS).array().optional(),
     subscriberUrl: z.string().optional(),
   })
 );