diff --git a/packages/features/eventtypes/repositories/eventTypeRepository.ts b/packages/features/eventtypes/repositories/eventTypeRepository.ts
index 0893adffb5..9331c5b013 100644
--- a/packages/features/eventtypes/repositories/eventTypeRepository.ts
+++ b/packages/features/eventtypes/repositories/eventTypeRepository.ts
@@ -8,11 +8,7 @@ import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { eventTypeSelect } from "@calcom/lib/server/eventTypeSelect";
 import type { PrismaClient } from "@calcom/prisma";
-import {
-  prisma,
-  availabilityUserSelect,
-  userSelect as userSelectWithSelectedCalendars,
-} from "@calcom/prisma";
+import { availabilityUserSelect, userSelect as userSelectWithSelectedCalendars } from "@calcom/prisma";
 import type { EventType as PrismaEventType } from "@calcom/prisma/client";
 import type { Prisma } from "@calcom/prisma/client";
 import { MembershipRole } from "@calcom/prisma/enums";
@@ -490,7 +486,7 @@ export class EventTypeRepository {
 
     if (!teamMembership) throw new ErrorWithCode(ErrorCode.Unauthorized, "User is not a member of this team");
 
-    return await prisma.eventType.findMany({
+    return await this.prismaClient.eventType.findMany({
       where: {
         teamId,
         ...where,
diff --git a/packages/trpc/server/routers/apps/routing-forms/deleteForm.schema.ts b/packages/trpc/server/routers/apps/routing-forms/deleteForm.schema.ts
index 8e3bab6a0e..b6a2329bbf 100644
--- a/packages/trpc/server/routers/apps/routing-forms/deleteForm.schema.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/deleteForm.schema.ts
@@ -1,7 +1,9 @@
 import z from "zod";
 
-export const ZDeleteFormInputSchema = z.object({
+export type TDeleteFormInputSchema = {
+  id: string;
+};
+
+export const ZDeleteFormInputSchema: z.ZodType<TDeleteFormInputSchema> = z.object({
   id: z.string(),
 });
-
-export type TDeleteFormInputSchema = z.infer<typeof ZDeleteFormInputSchema>;
diff --git a/packages/trpc/server/routers/apps/routing-forms/formQuery.schema.ts b/packages/trpc/server/routers/apps/routing-forms/formQuery.schema.ts
index 704fe59689..cffbc14946 100644
--- a/packages/trpc/server/routers/apps/routing-forms/formQuery.schema.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/formQuery.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZFormQueryInputSchema = z.object({
+export type TFormQueryInputSchema = {
+  id: string;
+};
+
+export const ZFormQueryInputSchema: z.ZodType<TFormQueryInputSchema> = z.object({
   id: z.string(),
 });
-
-export type TFormQueryInputSchema = z.infer<typeof ZFormQueryInputSchema>;
diff --git a/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.schema.ts b/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.schema.ts
index 102d396515..cd5eb341f1 100644
--- a/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.schema.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZGetAttributesForTeamInputSchema = z.object({
+export type TGetAttributesForTeamInputSchema = {
+  teamId: number;
+};
+
+export const ZGetAttributesForTeamInputSchema: z.ZodType<TGetAttributesForTeamInputSchema> = z.object({
   teamId: z.number(),
 });
-
-export type TGetAttributesForTeamInputSchema = z.infer<typeof ZGetAttributesForTeamInputSchema>;
diff --git a/packages/trpc/server/routers/apps/routing-forms/getIncompleteBookingSettings.schema.ts b/packages/trpc/server/routers/apps/routing-forms/getIncompleteBookingSettings.schema.ts
index 8f04950cd2..7ad3591fdf 100644
--- a/packages/trpc/server/routers/apps/routing-forms/getIncompleteBookingSettings.schema.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/getIncompleteBookingSettings.schema.ts
@@ -1,9 +1,10 @@
 import z from "zod";
 
-export const ZGetIncompleteBookingSettingsInputSchema = z.object({
-  formId: z.string(),
-});
+export type TGetIncompleteBookingSettingsInputSchema = {
+  formId: string;
+};
 
-export type TGetIncompleteBookingSettingsInputSchema = z.infer<
-  typeof ZGetIncompleteBookingSettingsInputSchema
->;
+export const ZGetIncompleteBookingSettingsInputSchema: z.ZodType<TGetIncompleteBookingSettingsInputSchema> =
+  z.object({
+    formId: z.string(),
+  });
diff --git a/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.schema.ts b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.schema.ts
index 0dd9b05ebb..19ad200d69 100644
--- a/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.schema.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.schema.ts
@@ -1,5 +1,9 @@
 import { z } from "zod";
 
-export const ZFormByResponseIdInputSchema = z.object({
+export type TFormByResponseIdInputSchema = {
+  formResponseId: number;
+};
+
+export const ZFormByResponseIdInputSchema: z.ZodType<TFormByResponseIdInputSchema> = z.object({
   formResponseId: z.number(),
 });
diff --git a/packages/trpc/server/routers/loggedInViewer/addNotificationsSubscription.schema.ts b/packages/trpc/server/routers/loggedInViewer/addNotificationsSubscription.schema.ts
index 25e1e9efe8..5abe13a812 100644
--- a/packages/trpc/server/routers/loggedInViewer/addNotificationsSubscription.schema.ts
+++ b/packages/trpc/server/routers/loggedInViewer/addNotificationsSubscription.schema.ts
@@ -1,9 +1,10 @@
 import { z } from "zod";
 
-export const ZAddNotificationsSubscriptionInputSchema = z.object({
-  subscription: z.string(),
-});
+export type TAddNotificationsSubscriptionInputSchema = {
+  subscription: string;
+};
 
-export type TAddNotificationsSubscriptionInputSchema = z.infer<
-  typeof ZAddNotificationsSubscriptionInputSchema
->;
+export const ZAddNotificationsSubscriptionInputSchema: z.ZodType<TAddNotificationsSubscriptionInputSchema> =
+  z.object({
+    subscription: z.string(),
+  });
diff --git a/packages/trpc/server/routers/loggedInViewer/addSecondaryEmail.schema.ts b/packages/trpc/server/routers/loggedInViewer/addSecondaryEmail.schema.ts
index 06fe66ffc8..82f00c2770 100644
--- a/packages/trpc/server/routers/loggedInViewer/addSecondaryEmail.schema.ts
+++ b/packages/trpc/server/routers/loggedInViewer/addSecondaryEmail.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZAddSecondaryEmailInputSchema = z.object({
+export type TAddSecondaryEmailInputSchema = {
+  email: string;
+};
+
+export const ZAddSecondaryEmailInputSchema: z.ZodType<TAddSecondaryEmailInputSchema> = z.object({
   email: z.string(),
 });
-
-export type TAddSecondaryEmailInputSchema = z.infer<typeof ZAddSecondaryEmailInputSchema>;
diff --git a/packages/trpc/server/routers/loggedInViewer/connectAndJoin.schema.ts b/packages/trpc/server/routers/loggedInViewer/connectAndJoin.schema.ts
index 43ae27a2f5..1f2930ba7a 100644
--- a/packages/trpc/server/routers/loggedInViewer/connectAndJoin.schema.ts
+++ b/packages/trpc/server/routers/loggedInViewer/connectAndJoin.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZConnectAndJoinInputSchema = z.object({
+export type TConnectAndJoinInputSchema = {
+  token: string;
+};
+
+export const ZConnectAndJoinInputSchema: z.ZodType<TConnectAndJoinInputSchema> = z.object({
   token: z.string(),
 });
-
-export type TConnectAndJoinInputSchema = z.infer<typeof ZConnectAndJoinInputSchema>;
diff --git a/packages/trpc/server/routers/loggedInViewer/eventTypeOrder.schema.ts b/packages/trpc/server/routers/loggedInViewer/eventTypeOrder.schema.ts
index 29faed3e47..d196114685 100644
--- a/packages/trpc/server/routers/loggedInViewer/eventTypeOrder.schema.ts
+++ b/packages/trpc/server/routers/loggedInViewer/eventTypeOrder.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZEventTypeOrderInputSchema = z.object({
+export type TEventTypeOrderInputSchema = {
+  ids: number[];
+};
+
+export const ZEventTypeOrderInputSchema: z.ZodType<TEventTypeOrderInputSchema> = z.object({
   ids: z.array(z.number()),
 });
-
-export type TEventTypeOrderInputSchema = z.infer<typeof ZEventTypeOrderInputSchema>;
diff --git a/packages/trpc/server/routers/loggedInViewer/removeNotificationsSubscription.schema.ts b/packages/trpc/server/routers/loggedInViewer/removeNotificationsSubscription.schema.ts
index be7cd36de8..3fc00fc906 100644
--- a/packages/trpc/server/routers/loggedInViewer/removeNotificationsSubscription.schema.ts
+++ b/packages/trpc/server/routers/loggedInViewer/removeNotificationsSubscription.schema.ts
@@ -1,9 +1,10 @@
 import { z } from "zod";
 
-export const ZRemoveNotificationsSubscriptionInputSchema = z.object({
-  subscription: z.string(),
-});
+export type TRemoveNotificationsSubscriptionInputSchema = {
+  subscription: string;
+};
 
-export type TRemoveNotificationsSubscriptionInputSchema = z.infer<
-  typeof ZRemoveNotificationsSubscriptionInputSchema
->;
+export const ZRemoveNotificationsSubscriptionInputSchema: z.ZodType<TRemoveNotificationsSubscriptionInputSchema> =
+  z.object({
+    subscription: z.string(),
+  });
diff --git a/packages/trpc/server/routers/loggedInViewer/routingFormOrder.schema.ts b/packages/trpc/server/routers/loggedInViewer/routingFormOrder.schema.ts
index 014a14859d..5b1eed27a1 100644
--- a/packages/trpc/server/routers/loggedInViewer/routingFormOrder.schema.ts
+++ b/packages/trpc/server/routers/loggedInViewer/routingFormOrder.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZRoutingFormOrderInputSchema = z.object({
+export type TRoutingFormOrderInputSchema = {
+  ids: string[];
+};
+
+export const ZRoutingFormOrderInputSchema: z.ZodType<TRoutingFormOrderInputSchema> = z.object({
   ids: z.array(z.string()),
 });
-
-export type TRoutingFormOrderInputSchema = z.infer<typeof ZRoutingFormOrderInputSchema>;
diff --git a/packages/trpc/server/routers/publicViewer/checkIfUserEmailVerificationRequired.schema.ts b/packages/trpc/server/routers/publicViewer/checkIfUserEmailVerificationRequired.schema.ts
index 1a6a6687ed..b6fc67eb7b 100644
--- a/packages/trpc/server/routers/publicViewer/checkIfUserEmailVerificationRequired.schema.ts
+++ b/packages/trpc/server/routers/publicViewer/checkIfUserEmailVerificationRequired.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZUserEmailVerificationRequiredSchema = z.object({
+export type TUserEmailVerificationRequiredSchema = {
+  userSessionEmail?: string;
+  email: string;
+};
+
+export const ZUserEmailVerificationRequiredSchema: z.ZodType<TUserEmailVerificationRequiredSchema> = z.object({
   userSessionEmail: z.string().optional(),
   email: z.string(),
 });
-
-export type TUserEmailVerificationRequiredSchema = z.infer<typeof ZUserEmailVerificationRequiredSchema>;
diff --git a/packages/trpc/server/routers/publicViewer/event.schema.ts b/packages/trpc/server/routers/publicViewer/event.schema.ts
index d10a5965cc..90c23debf4 100644
--- a/packages/trpc/server/routers/publicViewer/event.schema.ts
+++ b/packages/trpc/server/routers/publicViewer/event.schema.ts
@@ -1,6 +1,24 @@
 import z from "zod";
 
-export const ZEventInputSchema = z.object({
+// Note: fromRedirectOfNonOrgLink has .default(false), so input has it optional but output has it required
+
+export type TEventInputSchemaInput = {
+  username: string;
+  eventSlug: string;
+  isTeamEvent?: boolean;
+  org: string | null;
+  fromRedirectOfNonOrgLink?: boolean;
+};
+
+export type TEventInputSchema = {
+  username: string;
+  eventSlug: string;
+  isTeamEvent?: boolean;
+  org: string | null;
+  fromRedirectOfNonOrgLink: boolean;
+};
+
+export const ZEventInputSchema: z.ZodType<TEventInputSchema, z.ZodTypeDef, TEventInputSchemaInput> = z.object({
   username: z.string(),
   eventSlug: z.string(),
   isTeamEvent: z.boolean().optional(),
@@ -11,5 +29,3 @@ export const ZEventInputSchema = z.object({
    */
   fromRedirectOfNonOrgLink: z.boolean().optional().default(false),
 });
-
-export type TEventInputSchema = z.infer<typeof ZEventInputSchema>;
diff --git a/packages/trpc/server/routers/publicViewer/markHostAsNoShow.schema.ts b/packages/trpc/server/routers/publicViewer/markHostAsNoShow.schema.ts
index 053441cf8a..e46d6184d8 100644
--- a/packages/trpc/server/routers/publicViewer/markHostAsNoShow.schema.ts
+++ b/packages/trpc/server/routers/publicViewer/markHostAsNoShow.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZMarkHostAsNoShowInputSchema = z.object({
+export type TNoShowInputSchema = {
+  bookingUid: string;
+  noShowHost: boolean;
+};
+
+export const ZMarkHostAsNoShowInputSchema: z.ZodType<TNoShowInputSchema> = z.object({
   bookingUid: z.string(),
   noShowHost: z.boolean(),
 });
-
-export type TNoShowInputSchema = z.infer<typeof ZMarkHostAsNoShowInputSchema>;
diff --git a/packages/trpc/server/routers/publicViewer/samlTenantProduct.schema.ts b/packages/trpc/server/routers/publicViewer/samlTenantProduct.schema.ts
index c64ab2b78a..6aa3167548 100644
--- a/packages/trpc/server/routers/publicViewer/samlTenantProduct.schema.ts
+++ b/packages/trpc/server/routers/publicViewer/samlTenantProduct.schema.ts
@@ -2,8 +2,10 @@ import { z } from "zod";
 
 import { emailSchema } from "@calcom/lib/emailSchema";
 
-export const ZSamlTenantProductInputSchema = z.object({
+export type TSamlTenantProductInputSchema = {
+  email: string;
+};
+
+export const ZSamlTenantProductInputSchema: z.ZodType<TSamlTenantProductInputSchema> = z.object({
   email: emailSchema,
 });
-
-export type TSamlTenantProductInputSchema = z.infer<typeof ZSamlTenantProductInputSchema>;
diff --git a/packages/trpc/server/routers/publicViewer/submitRating.schema.ts b/packages/trpc/server/routers/publicViewer/submitRating.schema.ts
index cb163c8646..be4bfb0119 100644
--- a/packages/trpc/server/routers/publicViewer/submitRating.schema.ts
+++ b/packages/trpc/server/routers/publicViewer/submitRating.schema.ts
@@ -1,9 +1,13 @@
 import { z } from "zod";
 
-export const ZSubmitRatingInputSchema = z.object({
+export type TSubmitRatingInputSchema = {
+  bookingUid: string;
+  rating: number;
+  comment?: string;
+};
+
+export const ZSubmitRatingInputSchema: z.ZodType<TSubmitRatingInputSchema> = z.object({
   bookingUid: z.string(),
   rating: z.number(),
   comment: z.string().optional(),
 });
-
-export type TSubmitRatingInputSchema = z.infer<typeof ZSubmitRatingInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/apiKeys/create.schema.ts b/packages/trpc/server/routers/viewer/apiKeys/create.schema.ts
index 17660d9e02..bb9ab1616b 100644
--- a/packages/trpc/server/routers/viewer/apiKeys/create.schema.ts
+++ b/packages/trpc/server/routers/viewer/apiKeys/create.schema.ts
@@ -1,11 +1,17 @@
 import { z } from "zod";
 
-export const ZCreateInputSchema = z.object({
+export type TCreateInputSchema = {
+  note?: string | null;
+  expiresAt?: Date | null;
+  neverExpires?: boolean;
+  appId?: string | null;
+  teamId?: number;
+};
+
+export const ZCreateInputSchema: z.ZodType<TCreateInputSchema> = z.object({
   note: z.string().optional().nullish(),
   expiresAt: z.date().optional().nullable(),
   neverExpires: z.boolean().optional(),
   appId: z.string().optional().nullable(),
   teamId: z.number().optional(),
 });
-
-export type TCreateInputSchema = z.infer<typeof ZCreateInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/apiKeys/delete.schema.ts b/packages/trpc/server/routers/viewer/apiKeys/delete.schema.ts
index 6c5df814ce..0f457367da 100644
--- a/packages/trpc/server/routers/viewer/apiKeys/delete.schema.ts
+++ b/packages/trpc/server/routers/viewer/apiKeys/delete.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZDeleteInputSchema = z.object({
+export type TDeleteInputSchema = {
+  id: string;
+  eventTypeId?: number;
+};
+
+export const ZDeleteInputSchema: z.ZodType<TDeleteInputSchema> = z.object({
   id: z.string(),
   eventTypeId: z.number().optional(),
 });
-
-export type TDeleteInputSchema = z.infer<typeof ZDeleteInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/apiKeys/edit.schema.ts b/packages/trpc/server/routers/viewer/apiKeys/edit.schema.ts
index ae4edac3e8..9797f8490a 100644
--- a/packages/trpc/server/routers/viewer/apiKeys/edit.schema.ts
+++ b/packages/trpc/server/routers/viewer/apiKeys/edit.schema.ts
@@ -1,9 +1,13 @@
 import { z } from "zod";
 
-export const ZEditInputSchema = z.object({
+export type TEditInputSchema = {
+  id: string;
+  note?: string | null;
+  expiresAt?: Date;
+};
+
+export const ZEditInputSchema: z.ZodType<TEditInputSchema> = z.object({
   id: z.string(),
   note: z.string().optional().nullish(),
   expiresAt: z.date().optional(),
 });
-
-export type TEditInputSchema = z.infer<typeof ZEditInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/apiKeys/findKeyOfType.schema.ts b/packages/trpc/server/routers/viewer/apiKeys/findKeyOfType.schema.ts
index 4b91e9e57f..23d2b5b8bc 100644
--- a/packages/trpc/server/routers/viewer/apiKeys/findKeyOfType.schema.ts
+++ b/packages/trpc/server/routers/viewer/apiKeys/findKeyOfType.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZFindKeyOfTypeInputSchema = z.object({
+export type TFindKeyOfTypeInputSchema = {
+  appId?: string;
+  teamId?: number;
+};
+
+export const ZFindKeyOfTypeInputSchema: z.ZodType<TFindKeyOfTypeInputSchema> = z.object({
   appId: z.string().optional(),
   teamId: z.number().optional(),
 });
-
-export type TFindKeyOfTypeInputSchema = z.infer<typeof ZFindKeyOfTypeInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.schema.ts b/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.schema.ts
index 5aecc787d6..de3106510c 100644
--- a/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.schema.ts
+++ b/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.schema.ts
@@ -2,14 +2,19 @@ import { z } from "zod";
 
 import { zodAttributesQueryValue } from "@calcom/lib/raqb/zod";
 
-export const ZFindTeamMembersMatchingAttributeLogicInputSchema = z.object({
-  teamId: z.number(),
-  attributesQueryValue: zodAttributesQueryValue.nullable(),
-  isPreview: z.boolean().optional(),
-  _enablePerf: z.boolean().optional(),
-  _concurrency: z.number().optional(),
-});
+export type TFindTeamMembersMatchingAttributeLogicInputSchema = {
+  teamId: number;
+  attributesQueryValue: z.infer<typeof zodAttributesQueryValue> | null;
+  isPreview?: boolean;
+  _enablePerf?: boolean;
+  _concurrency?: number;
+};
 
-export type TFindTeamMembersMatchingAttributeLogicInputSchema = z.infer<
-  typeof ZFindTeamMembersMatchingAttributeLogicInputSchema
->;
+export const ZFindTeamMembersMatchingAttributeLogicInputSchema: z.ZodType<TFindTeamMembersMatchingAttributeLogicInputSchema> =
+  z.object({
+    teamId: z.number(),
+    attributesQueryValue: zodAttributesQueryValue.nullable(),
+    isPreview: z.boolean().optional(),
+    _enablePerf: z.boolean().optional(),
+    _concurrency: z.number().optional(),
+  });
diff --git a/packages/trpc/server/routers/viewer/auth/changePassword.schema.ts b/packages/trpc/server/routers/viewer/auth/changePassword.schema.ts
index 561ba42227..73d9143e61 100644
--- a/packages/trpc/server/routers/viewer/auth/changePassword.schema.ts
+++ b/packages/trpc/server/routers/viewer/auth/changePassword.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZChangePasswordInputSchema = z.object({
+export type TChangePasswordInputSchema = {
+  oldPassword: string;
+  newPassword: string;
+};
+
+export const ZChangePasswordInputSchema: z.ZodType<TChangePasswordInputSchema> = z.object({
   oldPassword: z.string(),
   newPassword: z.string(),
 });
-
-export type TChangePasswordInputSchema = z.infer<typeof ZChangePasswordInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/auth/sendVerifyEmailCode.schema.ts b/packages/trpc/server/routers/viewer/auth/sendVerifyEmailCode.schema.ts
index c009c5c458..714272a6c2 100644
--- a/packages/trpc/server/routers/viewer/auth/sendVerifyEmailCode.schema.ts
+++ b/packages/trpc/server/routers/viewer/auth/sendVerifyEmailCode.schema.ts
@@ -1,10 +1,15 @@
 import { z } from "zod";
 
-export const ZSendVerifyEmailCodeSchema = z.object({
+export type TSendVerifyEmailCodeSchema = {
+  email: string;
+  username?: string;
+  language: string;
+  isVerifyingEmail?: boolean;
+};
+
+export const ZSendVerifyEmailCodeSchema: z.ZodType<TSendVerifyEmailCodeSchema> = z.object({
   email: z.string().min(1),
   username: z.string().optional(),
   language: z.string(),
   isVerifyingEmail: z.boolean().optional(),
 });
-
-export type TSendVerifyEmailCodeSchema = z.infer<typeof ZSendVerifyEmailCodeSchema>;
diff --git a/packages/trpc/server/routers/viewer/auth/verifyPassword.schema.ts b/packages/trpc/server/routers/viewer/auth/verifyPassword.schema.ts
index 5acac97661..45d3d38865 100644
--- a/packages/trpc/server/routers/viewer/auth/verifyPassword.schema.ts
+++ b/packages/trpc/server/routers/viewer/auth/verifyPassword.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZVerifyPasswordInputSchema = z.object({
+export type TVerifyPasswordInputSchema = {
+  passwordInput: string;
+};
+
+export const ZVerifyPasswordInputSchema: z.ZodType<TVerifyPasswordInputSchema> = z.object({
   passwordInput: z.string(),
 });
-
-export type TVerifyPasswordInputSchema = z.infer<typeof ZVerifyPasswordInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/availability/schedule/create.schema.ts b/packages/trpc/server/routers/viewer/availability/schedule/create.schema.ts
index f029a10fa0..484006b7e0 100644
--- a/packages/trpc/server/routers/viewer/availability/schedule/create.schema.ts
+++ b/packages/trpc/server/routers/viewer/availability/schedule/create.schema.ts
@@ -1,6 +1,12 @@
 import { z } from "zod";
 
-export const ZCreateInputSchema = z.object({
+export type TCreateInputSchema = {
+  name: string;
+  schedule?: { start: Date; end: Date }[][];
+  eventTypeId?: number;
+};
+
+export const ZCreateInputSchema: z.ZodType<TCreateInputSchema> = z.object({
   name: z.string(),
   schedule: z
     .array(
@@ -14,5 +20,3 @@ export const ZCreateInputSchema = z.object({
     .optional(),
   eventTypeId: z.number().optional(),
 });
-
-export type TCreateInputSchema = z.infer<typeof ZCreateInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/bookings/addGuests.schema.ts b/packages/trpc/server/routers/viewer/bookings/addGuests.schema.ts
index f034c9e7c7..3d0ffd0ee6 100644
--- a/packages/trpc/server/routers/viewer/bookings/addGuests.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/addGuests.schema.ts
@@ -1,6 +1,14 @@
 import { z } from "zod";
 
-const ZGuestSchema = z.object({
+type TGuestSchema = {
+  email: string;
+  name?: string;
+  timeZone?: string;
+  phoneNumber?: string;
+  language?: string;
+};
+
+const ZGuestSchema: z.ZodType<TGuestSchema> = z.object({
   email: z.string().email(),
   name: z.string().optional(),
   timeZone: z.string().optional(),
@@ -8,9 +16,12 @@ const ZGuestSchema = z.object({
   language: z.string().optional(),
 });
 
-export const ZAddGuestsInputSchema = z.object({
+export type TAddGuestsInputSchema = {
+  bookingId: number;
+  guests: TGuestSchema[];
+};
+
+export const ZAddGuestsInputSchema: z.ZodType<TAddGuestsInputSchema> = z.object({
   bookingId: z.number(),
   guests: z.array(ZGuestSchema),
 });
-
-export type TAddGuestsInputSchema = z.infer<typeof ZAddGuestsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/bookings/find.schema.ts b/packages/trpc/server/routers/viewer/bookings/find.schema.ts
index 2cb830d4f0..b67e26895a 100644
--- a/packages/trpc/server/routers/viewer/bookings/find.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/find.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZFindInputSchema = z.object({
+export type TFindInputSchema = {
+  bookingUid?: string;
+};
+
+export const ZFindInputSchema: z.ZodType<TFindInputSchema> = z.object({
   bookingUid: z.string().optional(),
 });
-
-export type TFindInputSchema = z.infer<typeof ZFindInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/bookings/get.schema.ts b/packages/trpc/server/routers/viewer/bookings/get.schema.ts
index 487f334b44..e1b4f9d1a1 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.schema.ts
@@ -2,7 +2,47 @@ import { z } from "zod";
 
 import { ZTextFilterValue } from "@calcom/features/data-table/lib/types";
 
-export const ZGetInputSchema = z.object({
+// Note: offset has .default(0), so input type has it optional but output type has it required
+type BookingStatus = "upcoming" | "recurring" | "past" | "cancelled" | "unconfirmed";
+
+type TGetInputSchemaFilters = {
+  teamIds?: number[];
+  userIds?: number[];
+  status?: BookingStatus;
+  statuses?: BookingStatus[];
+  eventTypeIds?: number[];
+  attendeeEmail?: string | z.infer<typeof ZTextFilterValue>;
+  attendeeName?: string | z.infer<typeof ZTextFilterValue>;
+  bookingUid?: string;
+  afterStartDate?: string;
+  beforeEndDate?: string;
+  afterUpdatedDate?: string;
+  beforeUpdatedDate?: string;
+  afterCreatedDate?: string;
+  beforeCreatedDate?: string;
+};
+
+type TGetInputSchemaSort = {
+  sortStart?: "asc" | "desc";
+};
+
+export type TGetInputRawSchema = {
+  filters: TGetInputSchemaFilters;
+  limit: number;
+  offset?: number;
+  cursor?: string;
+  sort?: TGetInputSchemaSort;
+};
+
+export type TGetInputSchema = {
+  filters: TGetInputSchemaFilters;
+  limit: number;
+  offset: number;
+  cursor?: string;
+  sort?: TGetInputSchemaSort;
+};
+
+export const ZGetInputSchema: z.ZodType<TGetInputSchema, z.ZodTypeDef, TGetInputRawSchema> = z.object({
   filters: z.object({
     teamIds: z.number().array().optional(),
     userIds: z.number().array().optional(),
@@ -31,5 +71,3 @@ export const ZGetInputSchema = z.object({
     })
     .optional(),
 });
-
-export type TGetInputSchema = z.infer<typeof ZGetInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/bookings/getAuditLogs.schema.ts b/packages/trpc/server/routers/viewer/bookings/getAuditLogs.schema.ts
index 9ed51a0328..470892626e 100644
--- a/packages/trpc/server/routers/viewer/bookings/getAuditLogs.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/getAuditLogs.schema.ts
@@ -1,8 +1,10 @@
 import { z } from "zod";
 
-export const ZGetAuditLogsInputSchema = z.object({
-    bookingUid: z.string(),
+export type TGetAuditLogsInputSchema = {
+  bookingUid: string;
+};
+
+export const ZGetAuditLogsInputSchema: z.ZodType<TGetAuditLogsInputSchema> = z.object({
+  bookingUid: z.string(),
 });
 
-export type TGetAuditLogsInputSchema = z.infer<typeof ZGetAuditLogsInputSchema>;
-
diff --git a/packages/trpc/server/routers/viewer/bookings/getBookingAttendees.schema.ts b/packages/trpc/server/routers/viewer/bookings/getBookingAttendees.schema.ts
index 39087267b1..155f3cdc67 100644
--- a/packages/trpc/server/routers/viewer/bookings/getBookingAttendees.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/getBookingAttendees.schema.ts
@@ -1,5 +1,9 @@
 import { z } from "zod";
 
-export const ZGetBookingAttendeesInputSchema = z.object({ seatReferenceUid: z.string().uuid() });
+export type TGetBookingAttendeesInputSchema = {
+  seatReferenceUid: string;
+};
 
-export type TGetBookingAttendeesInputSchema = z.infer<typeof ZGetBookingAttendeesInputSchema>;
+export const ZGetBookingAttendeesInputSchema: z.ZodType<TGetBookingAttendeesInputSchema> = z.object({
+  seatReferenceUid: z.string().uuid(),
+});
diff --git a/packages/trpc/server/routers/viewer/bookings/getBookingDetails.schema.ts b/packages/trpc/server/routers/viewer/bookings/getBookingDetails.schema.ts
index ee2aff44f3..714943f0df 100644
--- a/packages/trpc/server/routers/viewer/bookings/getBookingDetails.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/getBookingDetails.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZGetBookingDetailsInputSchema = z.object({
+export type TGetBookingDetailsInputSchema = {
+  uid: string;
+};
+
+export const ZGetBookingDetailsInputSchema: z.ZodType<TGetBookingDetailsInputSchema> = z.object({
   uid: z.string(),
 });
-
-export type TGetBookingDetailsInputSchema = z.infer<typeof ZGetBookingDetailsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/bookings/getInstantBookingLocation.schema.ts b/packages/trpc/server/routers/viewer/bookings/getInstantBookingLocation.schema.ts
index 1b2de2b336..f7d10a5fce 100644
--- a/packages/trpc/server/routers/viewer/bookings/getInstantBookingLocation.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/getInstantBookingLocation.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZInstantBookingInputSchema = z.object({
+export type TInstantBookingInputSchema = {
+  bookingId: number;
+};
+
+export const ZInstantBookingInputSchema: z.ZodType<TInstantBookingInputSchema> = z.object({
   bookingId: z.number(),
 });
-
-export type TInstantBookingInputSchema = z.infer<typeof ZInstantBookingInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
index 1fa18d5495..7d8bc37c70 100644
--- a/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/reportBooking.schema.ts
@@ -2,10 +2,14 @@ import { z } from "zod";
 
 import { BookingReportReason } from "@calcom/prisma/enums";
 
-export const ZReportBookingInputSchema = z.object({
+export type TReportBookingInputSchema = {
+  bookingUid: string;
+  reason: BookingReportReason;
+  description?: string;
+};
+
+export const ZReportBookingInputSchema: z.ZodType<TReportBookingInputSchema> = z.object({
   bookingUid: z.string(),
   reason: z.nativeEnum(BookingReportReason),
   description: z.string().optional(),
 });
-
-export type TReportBookingInputSchema = z.infer<typeof ZReportBookingInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/bookings/requestReschedule.schema.ts b/packages/trpc/server/routers/viewer/bookings/requestReschedule.schema.ts
index 719364c241..a98fe0c5a4 100644
--- a/packages/trpc/server/routers/viewer/bookings/requestReschedule.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/requestReschedule.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZRequestRescheduleInputSchema = z.object({
+export type TRequestRescheduleInputSchema = {
+  bookingUid: string;
+  rescheduleReason?: string;
+};
+
+export const ZRequestRescheduleInputSchema: z.ZodType<TRequestRescheduleInputSchema> = z.object({
   bookingUid: z.string(),
   rescheduleReason: z.string().optional(),
 });
-
-export type TRequestRescheduleInputSchema = z.infer<typeof ZRequestRescheduleInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.schema.ts b/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.schema.ts
index 8741b05869..f3dc36e793 100644
--- a/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.schema.ts
+++ b/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.schema.ts
@@ -1,10 +1,15 @@
 import { z } from "zod";
 
-export const ZSetDestinationCalendarInputSchema = z.object({
+export type TSetDestinationCalendarInputSchema = {
+  integration: string;
+  externalId: string;
+  eventTypeId?: number | null;
+  bookingId?: number | null;
+};
+
+export const ZSetDestinationCalendarInputSchema: z.ZodType<TSetDestinationCalendarInputSchema> = z.object({
   integration: z.string(),
   externalId: z.string(),
   eventTypeId: z.number().nullish(),
   bookingId: z.number().nullish(),
 });
-
-export type TSetDestinationCalendarInputSchema = z.infer<typeof ZSetDestinationCalendarInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/deploymentSetup/update.schema.ts b/packages/trpc/server/routers/viewer/deploymentSetup/update.schema.ts
index d72f237321..8ae68c723f 100644
--- a/packages/trpc/server/routers/viewer/deploymentSetup/update.schema.ts
+++ b/packages/trpc/server/routers/viewer/deploymentSetup/update.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZUpdateInputSchema = z.object({
+export type TUpdateInputSchema = {
+  licenseKey?: string;
+  signatureToken?: string;
+};
+
+export const ZUpdateInputSchema: z.ZodType<TUpdateInputSchema> = z.object({
   licenseKey: z.string().optional(),
   signatureToken: z.string().optional(),
 });
-
-export type TUpdateInputSchema = z.infer<typeof ZUpdateInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/deploymentSetup/validateLicense.schema.ts b/packages/trpc/server/routers/viewer/deploymentSetup/validateLicense.schema.ts
index 823997cae1..a49f59154a 100644
--- a/packages/trpc/server/routers/viewer/deploymentSetup/validateLicense.schema.ts
+++ b/packages/trpc/server/routers/viewer/deploymentSetup/validateLicense.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZValidateLicenseInputSchema = z.object({
+export type TValidateLicenseInputSchema = {
+  licenseKey: string;
+};
+
+export const ZValidateLicenseInputSchema: z.ZodType<TValidateLicenseInputSchema> = z.object({
   licenseKey: z.string().min(1, "License key is required"),
 });
-
-export type TValidateLicenseInputSchema = z.infer<typeof ZValidateLicenseInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/eventTypes/delete.schema.ts b/packages/trpc/server/routers/viewer/eventTypes/delete.schema.ts
index 411d5e953b..519daf0dd8 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/delete.schema.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/delete.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZDeleteInputSchema = z.object({
+export type TDeleteInputSchema = {
+  id: number;
+};
+
+export const ZDeleteInputSchema: z.ZodType<TDeleteInputSchema> = z.object({
   id: z.number(),
 });
-
-export type TDeleteInputSchema = z.infer<typeof ZDeleteInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/eventTypes/get.schema.ts b/packages/trpc/server/routers/viewer/eventTypes/get.schema.ts
index d549577697..ffa401d0e0 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/get.schema.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/get.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZGetInputSchema = z.object({
+export type TGetInputSchema = {
+  id: number;
+};
+
+export const ZGetInputSchema: z.ZodType<TGetInputSchema> = z.object({
   id: z.number(),
 });
-
-export type TGetInputSchema = z.infer<typeof ZGetInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/eventTypes/getByViewer.schema.ts b/packages/trpc/server/routers/viewer/eventTypes/getByViewer.schema.ts
index a3b0b16b50..6b84c279af 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/getByViewer.schema.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/getByViewer.schema.ts
@@ -2,23 +2,51 @@ import { z } from "zod";
 
 import { SchedulingType } from "@calcom/prisma/enums";
 
-export const filterQuerySchemaStrict = z.object({
+// Define types first to use with z.ZodType annotation
+export type TFilterQuerySchemaStrict = {
+  teamIds?: number[];
+  upIds?: string[];
+  schedulingTypes?: SchedulingType[];
+};
+
+export const filterQuerySchemaStrict: z.ZodType<TFilterQuerySchemaStrict> = z.object({
   teamIds: z.number().array().optional(),
   // A user can only filter by only his userId
   upIds: z.string().array().max(1).optional(),
   schedulingTypes: z.nativeEnum(SchedulingType).array().optional(),
 });
 
-export const ZEventTypeInputSchema = z
+export type TEventTypeInputSchema = {
+  filters?: TFilterQuerySchemaStrict;
+  forRoutingForms?: boolean;
+} | null | undefined;
+
+export const ZEventTypeInputSchema: z.ZodType<TEventTypeInputSchema> = z
   .object({
     filters: filterQuerySchemaStrict.optional(),
     forRoutingForms: z.boolean().optional(),
   })
   .nullish();
 
-export type TEventTypeInputSchema = z.infer<typeof ZEventTypeInputSchema>;
+export type TGetEventTypesFromGroupSchemaInput = {
+  filters?: TFilterQuerySchemaStrict;
+  forRoutingForms?: boolean;
+  cursor?: number | null;
+  limit?: number;
+  group: { teamId?: number | null; parentId?: number | null };
+  searchQuery?: string;
+};
 
-export const ZGetEventTypesFromGroupSchema = z.object({
+export type TGetEventTypesFromGroupSchema = {
+  filters?: TFilterQuerySchemaStrict;
+  forRoutingForms?: boolean;
+  cursor?: number | null;
+  limit: number;
+  group: { teamId?: number | null; parentId?: number | null };
+  searchQuery?: string;
+};
+
+export const ZGetEventTypesFromGroupSchema: z.ZodType<TGetEventTypesFromGroupSchema, z.ZodTypeDef, TGetEventTypesFromGroupSchemaInput> = z.object({
   filters: filterQuerySchemaStrict.optional(),
   forRoutingForms: z.boolean().optional(),
   cursor: z.number().nullish(),
@@ -26,5 +54,3 @@ export const ZGetEventTypesFromGroupSchema = z.object({
   group: z.object({ teamId: z.number().nullish(), parentId: z.number().nullish() }),
   searchQuery: z.string().optional(),
 });
-
-export type TGetEventTypesFromGroupSchema = z.infer<typeof ZGetEventTypesFromGroupSchema>;
diff --git a/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts
index ad07d171d0..ed5fcefa9f 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts
@@ -684,7 +684,14 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => {
     slug: true,
     schedulingType: true,
   } satisfies Prisma.EventTypeSelect;
-  let updatedEventType: Prisma.EventTypeGetPayload<{ select: typeof updatedEventTypeSelect }>;
+
+  // Explicit type to avoid Prisma.EventTypeGetPayload conditional types leaking into .d.ts files
+  type UpdatedEventTypeResult = {
+    slug: string;
+    schedulingType: import("@calcom/prisma/enums").SchedulingType | null;
+  };
+
+  let updatedEventType: UpdatedEventTypeResult;
   try {
     updatedEventType = await ctx.prisma.eventType.update({
       where: { id },
diff --git a/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts b/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts
index 8c05be4a4e..c5b3fd4005 100644
--- a/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts
+++ b/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts
@@ -18,6 +18,7 @@ import slugify from "@calcom/lib/slugify";
 import { validateBookerLayouts } from "@calcom/lib/validateBookerLayouts";
 import { prisma } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
+import type { JsonValue } from "@calcom/types/Json";
 import { userMetadata as userMetadataSchema } from "@calcom/prisma/zod-utils";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
@@ -240,7 +241,22 @@ export const updateProfileHandler = async ({ ctx, input }: UpdateProfileOptions)
     },
   } satisfies Prisma.UserDefaultArgs;
 
-  let updatedUser: Prisma.UserGetPayload<typeof updatedUserSelect>;
+  // Explicit type to avoid Prisma.UserGetPayload conditional types leaking into .d.ts files
+  type UpdatedUserResult = {
+    id: number;
+    username: string | null;
+    email: string;
+    identityProvider: string | null;
+    identityProviderId: string | null;
+    metadata: JsonValue;
+    name: string | null;
+    createdDate: Date;
+    avatarUrl: string | null;
+    locale: string | null;
+    schedules: { id: number }[];
+  };
+
+  let updatedUser: UpdatedUserResult;
 
   try {
     updatedUser = await prisma.user.update({
diff --git a/packages/trpc/server/routers/viewer/me/updateProfile.schema.ts b/packages/trpc/server/routers/viewer/me/updateProfile.schema.ts
index 9fd19441e4..a29a3285ef 100644
--- a/packages/trpc/server/routers/viewer/me/updateProfile.schema.ts
+++ b/packages/trpc/server/routers/viewer/me/updateProfile.schema.ts
@@ -4,12 +4,87 @@ import { FULL_NAME_LENGTH_MAX_LIMIT } from "@calcom/lib/constants";
 import { timeZoneSchema } from "@calcom/lib/dayjs/timeZone.schema";
 import { bookerLayouts, userMetadata } from "@calcom/prisma/zod-utils";
 
-export const updateUserMetadataAllowedKeys = z.object({
+export type TUpdateUserMetadataAllowedKeys = {
+  sessionTimeout?: number;
+  defaultBookerLayouts?: z.infer<typeof bookerLayouts>;
+};
+
+export const updateUserMetadataAllowedKeys: z.ZodType<TUpdateUserMetadataAllowedKeys> = z.object({
   sessionTimeout: z.number().optional(), // Minutes
   defaultBookerLayouts: bookerLayouts.optional(),
 });
 
-export const ZUpdateProfileInputSchema = z.object({
+export type TUpdateProfileInputSchemaInput = {
+  username?: string;
+  name?: string;
+  email?: string;
+  bio?: string;
+  avatarUrl?: string | null;
+  timeZone?: string;
+  weekStart?: string;
+  hideBranding?: boolean;
+  allowDynamicBooking?: boolean;
+  allowSEOIndexing?: boolean;
+  receiveMonthlyDigestEmail?: boolean;
+  requiresBookerEmailVerification?: boolean;
+  brandColor?: string;
+  darkBrandColor?: string;
+  theme?: string | null;
+  appTheme?: string | null;
+  completedOnboarding?: boolean;
+  locale?: string;
+  timeFormat?: number;
+  disableImpersonation?: boolean;
+  metadata?: z.infer<typeof userMetadata>;
+  travelSchedules?: {
+    id?: number;
+    timeZone: string;
+    endDate?: Date;
+    startDate: Date;
+  }[];
+  secondaryEmails?: {
+    id: number;
+    email: string;
+    isDeleted?: boolean;
+  }[];
+};
+
+export type TUpdateProfileInputSchema = {
+  username?: string;
+  name?: string;
+  email?: string;
+  bio?: string;
+  avatarUrl?: string | null;
+  timeZone?: string;
+  weekStart?: string;
+  hideBranding?: boolean;
+  allowDynamicBooking?: boolean;
+  allowSEOIndexing?: boolean;
+  receiveMonthlyDigestEmail?: boolean;
+  requiresBookerEmailVerification?: boolean;
+  brandColor?: string;
+  darkBrandColor?: string;
+  theme?: string | null;
+  appTheme?: string | null;
+  completedOnboarding?: boolean;
+  locale?: string;
+  timeFormat?: number;
+  disableImpersonation?: boolean;
+  metadata?: z.infer<typeof userMetadata>;
+  travelSchedules?: {
+    id?: number;
+    timeZone: string;
+    endDate?: Date;
+    startDate: Date;
+  }[];
+  secondaryEmails?: {
+    id: number;
+    email: string;
+    isDeleted: boolean;
+  }[];
+};
+
+export const ZUpdateProfileInputSchema: z.ZodType<TUpdateProfileInputSchema, z.ZodTypeDef, TUpdateProfileInputSchemaInput> = z.object({
   username: z.string().optional(),
   name: z.string().max(FULL_NAME_LENGTH_MAX_LIMIT).optional(),
   email: z.string().optional(),
@@ -51,5 +126,3 @@ export const ZUpdateProfileInputSchema = z.object({
     )
     .optional(),
 });
-
-export type TUpdateProfileInputSchema = z.infer<typeof ZUpdateProfileInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/oAuth/addClient.schema.ts b/packages/trpc/server/routers/viewer/oAuth/addClient.schema.ts
index d0ec12cdc0..5313026831 100644
--- a/packages/trpc/server/routers/viewer/oAuth/addClient.schema.ts
+++ b/packages/trpc/server/routers/viewer/oAuth/addClient.schema.ts
@@ -1,10 +1,22 @@
 import { z } from "zod";
 
-export const ZAddClientInputSchema = z.object({
+export type TAddClientInputSchemaInput = {
+  name: string;
+  redirectUri: string;
+  logo: string;
+  enablePkce?: boolean;
+};
+
+export type TAddClientInputSchema = {
+  name: string;
+  redirectUri: string;
+  logo: string;
+  enablePkce: boolean;
+};
+
+export const ZAddClientInputSchema: z.ZodType<TAddClientInputSchema, z.ZodTypeDef, TAddClientInputSchemaInput> = z.object({
   name: z.string(),
   redirectUri: z.string(),
   logo: z.string(),
   enablePkce: z.boolean().optional().default(false),
 });
-
-export type TAddClientInputSchema = z.infer<typeof ZAddClientInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/oAuth/generateAuthCode.schema.ts b/packages/trpc/server/routers/viewer/oAuth/generateAuthCode.schema.ts
index f1781ce5a4..c1b3ae14c7 100644
--- a/packages/trpc/server/routers/viewer/oAuth/generateAuthCode.schema.ts
+++ b/packages/trpc/server/routers/viewer/oAuth/generateAuthCode.schema.ts
@@ -1,11 +1,17 @@
 import { z } from "zod";
 
-export const ZGenerateAuthCodeInputSchema = z.object({
+export type TGenerateAuthCodeInputSchema = {
+  clientId: string;
+  scopes: string[];
+  teamSlug?: string;
+  codeChallenge?: string;
+  codeChallengeMethod?: "S256";
+};
+
+export const ZGenerateAuthCodeInputSchema: z.ZodType<TGenerateAuthCodeInputSchema> = z.object({
   clientId: z.string(),
   scopes: z.array(z.string()),
   teamSlug: z.string().optional(),
   codeChallenge: z.string().optional(),
   codeChallengeMethod: z.enum(["S256"]).optional(),
 });
-
-export type TGenerateAuthCodeInputSchema = z.infer<typeof ZGenerateAuthCodeInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/ooo/outOfOfficeCreateOrUpdate.handler.ts b/packages/trpc/server/routers/viewer/ooo/outOfOfficeCreateOrUpdate.handler.ts
index f77846e9b4..a1668ccc07 100644
--- a/packages/trpc/server/routers/viewer/ooo/outOfOfficeCreateOrUpdate.handler.ts
+++ b/packages/trpc/server/routers/viewer/ooo/outOfOfficeCreateOrUpdate.handler.ts
@@ -9,7 +9,6 @@ import type { OOOEntryPayloadType } from "@calcom/features/webhooks/lib/sendPayl
 import sendPayload from "@calcom/features/webhooks/lib/sendPayload";
 import { getTranslation } from "@calcom/lib/server/i18n";
 import prisma from "@calcom/prisma";
-import type { Prisma } from "@calcom/prisma/client";
 import { WebhookTriggerEvents } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
@@ -196,7 +195,23 @@ export const outOfOfficeCreateOrUpdate = async ({ ctx, input }: TBookingRedirect
       toUserId: toUserId ? toUserId : null,
     },
   });
-  let resultRedirect: Prisma.OutOfOfficeEntryGetPayload<{ select: typeof selectOOOEntries }> | null = null;
+  // Explicit type to avoid Prisma.OutOfOfficeEntryGetPayload conditional types leaking into .d.ts files
+  type OOOEntryResult = {
+    id: number;
+    start: Date;
+    end: Date;
+    createdAt: Date;
+    updatedAt: Date;
+    notes: string | null;
+    showNotePublicly: boolean;
+    reason: { reason: string; emoji: string } | null;
+    reasonId: number | null;
+    user: { id: number; name: string | null; email: string; timeZone: string };
+    toUser: { id: number; name: string | null; email: string; timeZone: string } | null;
+    uuid: string;
+  };
+
+  let resultRedirect: OOOEntryResult | null = null;
   if (createdOrUpdatedOutOfOffice) {
     const findRedirect = await prisma.outOfOfficeEntry.findUnique({
       where: {
diff --git a/packages/trpc/server/routers/viewer/organizations/listMembers.schema.ts b/packages/trpc/server/routers/viewer/organizations/listMembers.schema.ts
index b30f71b3bc..bfd6a8078c 100644
--- a/packages/trpc/server/routers/viewer/organizations/listMembers.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/listMembers.schema.ts
@@ -9,7 +9,16 @@ const ZListMembersFilter = z.object({
   value: ZFilterValue,
 });
 
-export const ZListMembersInputSchema = z.object({
+export type TListMembersSchema = {
+  limit: number;
+  offset: number;
+  searchTerm?: string;
+  expand?: ("attributes")[];
+  filters?: { id: string; value: z.infer<typeof ZFilterValue> }[];
+  oAuthClientId?: string;
+};
+
+export const ZListMembersInputSchema: z.ZodType<TListMembersSchema> = z.object({
   limit: z.number().min(1).max(100),
   offset: z.number(),
   searchTerm: z.string().optional(),
@@ -17,5 +26,3 @@ export const ZListMembersInputSchema = z.object({
   filters: z.array(ZListMembersFilter).optional(),
   oAuthClientId: z.string().optional(),
 });
-
-export type TListMembersSchema = z.infer<typeof ZListMembersInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/organizations/update.schema.ts b/packages/trpc/server/routers/viewer/organizations/update.schema.ts
index ec617dc998..6ec5fbeaab 100644
--- a/packages/trpc/server/routers/viewer/organizations/update.schema.ts
+++ b/packages/trpc/server/routers/viewer/organizations/update.schema.ts
@@ -3,7 +3,81 @@ import { z } from "zod";
 import { timeZoneSchema } from "@calcom/lib/dayjs/timeZone.schema";
 import { teamMetadataStrictSchema } from "@calcom/prisma/zod-utils";
 
-export const ZUpdateInputSchema = z.object({
+// Note: orgId has .transform() that converts string to number, so input accepts string | number but output is always number
+
+export type TUpdateInputSchemaInput = {
+  name?: string;
+  orgId?: string | number;
+  bio?: string;
+  logoUrl?: string | null;
+  calVideoLogo?: string | null;
+  banner?: string | null;
+  slug?: string;
+  hideBranding?: boolean;
+  hideBookATeamMember?: boolean;
+  brandColor?: string;
+  darkBrandColor?: string;
+  theme?: string | null;
+  timeZone?: string;
+  weekStart?: string;
+  timeFormat?: number;
+  metadata?: z.infer<ReturnType<typeof teamMetadataStrictSchema.unwrap>>;
+  lockEventTypeCreation?: boolean;
+  lockEventTypeCreationOptions?: "DELETE" | "HIDE";
+  adminGetsNoSlotsNotification?: boolean;
+  allowSEOIndexing?: boolean;
+  orgProfileRedirectsToVerifiedDomain?: boolean;
+  disablePhoneOnlySMSNotifications?: boolean;
+  disableAutofillOnBookingPage?: boolean;
+  orgAutoJoinOnSignup?: boolean;
+  disableAttendeeConfirmationEmail?: boolean;
+  disableAttendeeCancellationEmail?: boolean;
+  disableAttendeeRescheduledEmail?: boolean;
+  disableAttendeeRequestEmail?: boolean;
+  disableAttendeeReassignedEmail?: boolean;
+  disableAttendeeAwaitingPaymentEmail?: boolean;
+  disableAttendeeRescheduleRequestEmail?: boolean;
+  disableAttendeeLocationChangeEmail?: boolean;
+  disableAttendeeNewEventEmail?: boolean;
+};
+
+export type TUpdateInputSchema = {
+  name?: string;
+  orgId?: number;
+  bio?: string;
+  logoUrl?: string | null;
+  calVideoLogo?: string | null;
+  banner?: string | null;
+  slug?: string;
+  hideBranding?: boolean;
+  hideBookATeamMember?: boolean;
+  brandColor?: string;
+  darkBrandColor?: string;
+  theme?: string | null;
+  timeZone?: string;
+  weekStart?: string;
+  timeFormat?: number;
+  metadata?: z.infer<ReturnType<typeof teamMetadataStrictSchema.unwrap>>;
+  lockEventTypeCreation?: boolean;
+  lockEventTypeCreationOptions?: "DELETE" | "HIDE";
+  adminGetsNoSlotsNotification?: boolean;
+  allowSEOIndexing?: boolean;
+  orgProfileRedirectsToVerifiedDomain?: boolean;
+  disablePhoneOnlySMSNotifications?: boolean;
+  disableAutofillOnBookingPage?: boolean;
+  orgAutoJoinOnSignup?: boolean;
+  disableAttendeeConfirmationEmail?: boolean;
+  disableAttendeeCancellationEmail?: boolean;
+  disableAttendeeRescheduledEmail?: boolean;
+  disableAttendeeRequestEmail?: boolean;
+  disableAttendeeReassignedEmail?: boolean;
+  disableAttendeeAwaitingPaymentEmail?: boolean;
+  disableAttendeeRescheduleRequestEmail?: boolean;
+  disableAttendeeLocationChangeEmail?: boolean;
+  disableAttendeeNewEventEmail?: boolean;
+};
+
+export const ZUpdateInputSchema: z.ZodType<TUpdateInputSchema, z.ZodTypeDef, TUpdateInputSchemaInput> = z.object({
   name: z.string().optional(),
   orgId: z
     .string()
@@ -47,5 +121,3 @@ export const ZUpdateInputSchema = z.object({
   disableAttendeeLocationChangeEmail: z.boolean().optional(),
   disableAttendeeNewEventEmail: z.boolean().optional(),
 });
-
-export type TUpdateInputSchema = z.infer<typeof ZUpdateInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/sso/delete.schema.ts b/packages/trpc/server/routers/viewer/sso/delete.schema.ts
index 0ad5d3c40f..4574fb5df3 100644
--- a/packages/trpc/server/routers/viewer/sso/delete.schema.ts
+++ b/packages/trpc/server/routers/viewer/sso/delete.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZDeleteInputSchema = z.object({
+export type TDeleteInputSchema = {
+  teamId: number | null;
+};
+
+export const ZDeleteInputSchema: z.ZodType<TDeleteInputSchema> = z.object({
   teamId: z.union([z.number(), z.null()]),
 });
-
-export type TDeleteInputSchema = z.infer<typeof ZDeleteInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/sso/get.schema.ts b/packages/trpc/server/routers/viewer/sso/get.schema.ts
index 044011e4e8..f1208d2e03 100644
--- a/packages/trpc/server/routers/viewer/sso/get.schema.ts
+++ b/packages/trpc/server/routers/viewer/sso/get.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZGetInputSchema = z.object({
+export type TGetInputSchema = {
+  teamId: number | null;
+};
+
+export const ZGetInputSchema: z.ZodType<TGetInputSchema> = z.object({
   teamId: z.union([z.number(), z.null()]),
 });
-
-export type TGetInputSchema = z.infer<typeof ZGetInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/sso/update.schema.ts b/packages/trpc/server/routers/viewer/sso/update.schema.ts
index e5e456c9d9..e669878d72 100644
--- a/packages/trpc/server/routers/viewer/sso/update.schema.ts
+++ b/packages/trpc/server/routers/viewer/sso/update.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZUpdateInputSchema = z.object({
+export type TUpdateInputSchema = {
+  encodedRawMetadata: string;
+  teamId: number | null;
+};
+
+export const ZUpdateInputSchema: z.ZodType<TUpdateInputSchema> = z.object({
   encodedRawMetadata: z.string(),
   teamId: z.union([z.number(), z.null()]),
 });
-
-export type TUpdateInputSchema = z.infer<typeof ZUpdateInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/sso/updateOIDC.schema.ts b/packages/trpc/server/routers/viewer/sso/updateOIDC.schema.ts
index 9adefc1f7d..3b3c358df5 100644
--- a/packages/trpc/server/routers/viewer/sso/updateOIDC.schema.ts
+++ b/packages/trpc/server/routers/viewer/sso/updateOIDC.schema.ts
@@ -1,10 +1,15 @@
 import { z } from "zod";
 
-export const ZUpdateOIDCInputSchema = z.object({
+export type TUpdateOIDCInputSchema = {
+  teamId: number | null;
+  clientId: string;
+  clientSecret: string;
+  wellKnownUrl: string;
+};
+
+export const ZUpdateOIDCInputSchema: z.ZodType<TUpdateOIDCInputSchema> = z.object({
   teamId: z.union([z.number(), z.null()]),
   clientId: z.string(),
   clientSecret: z.string(),
   wellKnownUrl: z.string(),
 });
-
-export type TUpdateOIDCInputSchema = z.infer<typeof ZUpdateOIDCInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/acceptOrLeave.schema.ts b/packages/trpc/server/routers/viewer/teams/acceptOrLeave.schema.ts
index 546466f9ad..c4bfa50a72 100644
--- a/packages/trpc/server/routers/viewer/teams/acceptOrLeave.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/acceptOrLeave.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZAcceptOrLeaveInputSchema = z.object({
+export type TAcceptOrLeaveInputSchema = {
+  teamId: number;
+  accept: boolean;
+};
+
+export const ZAcceptOrLeaveInputSchema: z.ZodType<TAcceptOrLeaveInputSchema> = z.object({
   teamId: z.number(),
   accept: z.boolean(),
 });
-
-export type TAcceptOrLeaveInputSchema = z.infer<typeof ZAcceptOrLeaveInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/addMembersToEventTypes.schema.ts b/packages/trpc/server/routers/viewer/teams/addMembersToEventTypes.schema.ts
index c9c5a53b60..defd9625cc 100644
--- a/packages/trpc/server/routers/viewer/teams/addMembersToEventTypes.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/addMembersToEventTypes.schema.ts
@@ -1,9 +1,13 @@
 import { z } from "zod";
 
-export const ZAddMembersToEventTypes = z.object({
+export type TAddMembersToEventTypes = {
+  userIds: number[];
+  teamId: number;
+  eventTypeIds: number[];
+};
+
+export const ZAddMembersToEventTypes: z.ZodType<TAddMembersToEventTypes> = z.object({
   userIds: z.array(z.number()),
   teamId: z.number(),
   eventTypeIds: z.array(z.number()),
 });
-
-export type TAddMembersToEventTypes = z.infer<typeof ZAddMembersToEventTypes>;
diff --git a/packages/trpc/server/routers/viewer/teams/changeMemberRole.schema.ts b/packages/trpc/server/routers/viewer/teams/changeMemberRole.schema.ts
index d8eb41aec2..6a4c9ec423 100644
--- a/packages/trpc/server/routers/viewer/teams/changeMemberRole.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/changeMemberRole.schema.ts
@@ -2,10 +2,14 @@ import { z } from "zod";
 
 import { MembershipRole } from "@calcom/prisma/enums";
 
-export const ZChangeMemberRoleInputSchema = z.object({
+export type TChangeMemberRoleInputSchema = {
+  teamId: number;
+  memberId: number;
+  role: MembershipRole | string;
+};
+
+export const ZChangeMemberRoleInputSchema: z.ZodType<TChangeMemberRoleInputSchema> = z.object({
   teamId: z.number(),
   memberId: z.number(),
   role: z.union([z.nativeEnum(MembershipRole), z.string()]), // Support both traditional roles and custom role IDs
 });
-
-export type TChangeMemberRoleInputSchema = z.infer<typeof ZChangeMemberRoleInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/checkIfMembershipExists.schema.ts b/packages/trpc/server/routers/viewer/teams/checkIfMembershipExists.schema.ts
index a7b7f7e19b..c550ca7a53 100644
--- a/packages/trpc/server/routers/viewer/teams/checkIfMembershipExists.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/checkIfMembershipExists.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZCheckIfMembershipExistsInputSchema = z.object({
+export type TCheckIfMembershipExistsInputSchema = {
+  teamId: number;
+  value: string;
+};
+
+export const ZCheckIfMembershipExistsInputSchema: z.ZodType<TCheckIfMembershipExistsInputSchema> = z.object({
   teamId: z.number(),
   value: z.string(),
 });
-
-export type TCheckIfMembershipExistsInputSchema = z.infer<typeof ZCheckIfMembershipExistsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/create.schema.ts b/packages/trpc/server/routers/viewer/teams/create.schema.ts
index 87937c24fc..7dd088e0a2 100644
--- a/packages/trpc/server/routers/viewer/teams/create.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/create.schema.ts
@@ -2,7 +2,15 @@ import { z } from "zod";
 
 import slugify from "@calcom/lib/slugify";
 
-export const ZCreateInputSchema = z.object({
+export type TCreateInputSchema = {
+  name: string;
+  slug: string;
+  logo?: string | null;
+  bio?: string;
+  isOnboarding?: boolean;
+};
+
+export const ZCreateInputSchema: z.ZodType<TCreateInputSchema> = z.object({
   name: z.string(),
   slug: z.string().transform((val) => slugify(val.trim())),
   logo: z
@@ -13,5 +21,3 @@ export const ZCreateInputSchema = z.object({
   bio: z.string().optional(),
   isOnboarding: z.boolean().optional(),
 });
-
-export type TCreateInputSchema = z.infer<typeof ZCreateInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/createInvite.schema.ts b/packages/trpc/server/routers/viewer/teams/createInvite.schema.ts
index a0a980622c..c0c5f82c7c 100644
--- a/packages/trpc/server/routers/viewer/teams/createInvite.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/createInvite.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZCreateInviteInputSchema = z.object({
+export type TCreateInviteInputSchema = {
+  teamId: number;
+  token?: string;
+};
+
+export const ZCreateInviteInputSchema: z.ZodType<TCreateInviteInputSchema> = z.object({
   teamId: z.number(),
   token: z.string().optional(),
 });
-
-export type TCreateInviteInputSchema = z.infer<typeof ZCreateInviteInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/delete.schema.ts b/packages/trpc/server/routers/viewer/teams/delete.schema.ts
index 01556322c6..8bd1b93159 100644
--- a/packages/trpc/server/routers/viewer/teams/delete.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/delete.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZDeleteInputSchema = z.object({
+export type TDeleteInputSchema = {
+  teamId: number;
+};
+
+export const ZDeleteInputSchema: z.ZodType<TDeleteInputSchema> = z.object({
   teamId: z.number(),
 });
-
-export type TDeleteInputSchema = z.infer<typeof ZDeleteInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/deleteInvite.schema.ts b/packages/trpc/server/routers/viewer/teams/deleteInvite.schema.ts
index 8b50af62dc..c29f8cfceb 100644
--- a/packages/trpc/server/routers/viewer/teams/deleteInvite.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/deleteInvite.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZDeleteInviteInputSchema = z.object({
+export type TDeleteInviteInputSchema = {
+  token: string;
+};
+
+export const ZDeleteInviteInputSchema: z.ZodType<TDeleteInviteInputSchema> = z.object({
   token: z.string(),
 });
-
-export type TDeleteInviteInputSchema = z.infer<typeof ZDeleteInviteInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/get.schema.ts b/packages/trpc/server/routers/viewer/teams/get.schema.ts
index 8542d2e68e..89f8dc7c63 100644
--- a/packages/trpc/server/routers/viewer/teams/get.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/get.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZGetSchema = z.object({
+export type TGetInputSchema = {
+  teamId: number;
+  isOrg?: boolean;
+};
+
+export const ZGetSchema: z.ZodType<TGetInputSchema> = z.object({
   teamId: z.number(),
   isOrg: z.boolean().optional(),
 });
-
-export type TGetInputSchema = z.infer<typeof ZGetSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/getInternalNotesPresets.schema.ts b/packages/trpc/server/routers/viewer/teams/getInternalNotesPresets.schema.ts
index 5847e7b777..c451fcb676 100644
--- a/packages/trpc/server/routers/viewer/teams/getInternalNotesPresets.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/getInternalNotesPresets.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZGetInternalNotesPresetsInputSchema = z.object({
+export type TGetInternalNotesPresetsInputSchema = {
+  teamId: number;
+};
+
+export const ZGetInternalNotesPresetsInputSchema: z.ZodType<TGetInternalNotesPresetsInputSchema> = z.object({
   teamId: z.number(),
 });
-
-export type TGetInternalNotesPresetsInputSchema = z.infer<typeof ZGetInternalNotesPresetsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/getMemberAvailability.schema.ts b/packages/trpc/server/routers/viewer/teams/getMemberAvailability.schema.ts
index 8cc05ab10c..6a307ab896 100644
--- a/packages/trpc/server/routers/viewer/teams/getMemberAvailability.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/getMemberAvailability.schema.ts
@@ -2,12 +2,18 @@ import { z } from "zod";
 
 import { timeZoneSchema } from "@calcom/lib/dayjs/timeZone.schema";
 
-export const ZGetMemberAvailabilityInputSchema = z.object({
+export type TGetMemberAvailabilityInputSchema = {
+  teamId: number;
+  memberId: number;
+  timezone: string;
+  dateFrom: string;
+  dateTo: string;
+};
+
+export const ZGetMemberAvailabilityInputSchema: z.ZodType<TGetMemberAvailabilityInputSchema> = z.object({
   teamId: z.number(),
   memberId: z.number(),
   timezone: timeZoneSchema,
   dateFrom: z.string(),
   dateTo: z.string(),
 });
-
-export type TGetMemberAvailabilityInputSchema = z.infer<typeof ZGetMemberAvailabilityInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/getMembershipbyUser.schema.ts b/packages/trpc/server/routers/viewer/teams/getMembershipbyUser.schema.ts
index 5488cf22d7..af67c07ef2 100644
--- a/packages/trpc/server/routers/viewer/teams/getMembershipbyUser.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/getMembershipbyUser.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZGetMembershipbyUserInputSchema = z.object({
+export type TGetMembershipbyUserInputSchema = {
+  teamId: number;
+  memberId: number;
+};
+
+export const ZGetMembershipbyUserInputSchema: z.ZodType<TGetMembershipbyUserInputSchema> = z.object({
   teamId: z.number(),
   memberId: z.number(),
 });
-
-export type TGetMembershipbyUserInputSchema = z.infer<typeof ZGetMembershipbyUserInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/getUserConnectedApps.handler.ts b/packages/trpc/server/routers/viewer/teams/getUserConnectedApps.handler.ts
index e6a2d05977..7fb96e944a 100644
--- a/packages/trpc/server/routers/viewer/teams/getUserConnectedApps.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/getUserConnectedApps.handler.ts
@@ -28,7 +28,12 @@ const credentialSelect = {
   },
 } satisfies Prisma.CredentialSelect;
 
-type Credential = Prisma.CredentialGetPayload<{ select: typeof credentialSelect }>;
+// Explicit type to avoid Prisma.CredentialGetPayload conditional types leaking into .d.ts files
+type Credential = {
+  userId: number | null;
+  app: { slug: string; categories: AppCategories[] } | null;
+  destinationCalendars: { externalId: string }[];
+};
 
 type Apps = {
   name: string | null;
diff --git a/packages/trpc/server/routers/viewer/teams/getUserConnectedApps.schema.ts b/packages/trpc/server/routers/viewer/teams/getUserConnectedApps.schema.ts
index 4f7a4d84d8..341e9153d4 100644
--- a/packages/trpc/server/routers/viewer/teams/getUserConnectedApps.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/getUserConnectedApps.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZGetUserConnectedAppsInputSchema = z.object({
+export type TGetUserConnectedAppsInputSchema = {
+  userIds: number[];
+  teamId: number;
+};
+
+export const ZGetUserConnectedAppsInputSchema: z.ZodType<TGetUserConnectedAppsInputSchema> = z.object({
   userIds: z.array(z.number()),
   teamId: z.number(),
 });
-
-export type TGetUserConnectedAppsInputSchema = z.infer<typeof ZGetUserConnectedAppsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/hasEditPermissionForUser.schema.ts b/packages/trpc/server/routers/viewer/teams/hasEditPermissionForUser.schema.ts
index 1239d81151..ca727018c9 100644
--- a/packages/trpc/server/routers/viewer/teams/hasEditPermissionForUser.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/hasEditPermissionForUser.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZHasEditPermissionForUserSchema = z.object({
+export type THasEditPermissionForUserSchema = {
+  memberId: number;
+};
+
+export const ZHasEditPermissionForUserSchema: z.ZodType<THasEditPermissionForUserSchema> = z.object({
   memberId: z.number(),
 });
-
-export type THasEditPermissionForUserSchema = z.infer<typeof ZHasEditPermissionForUserSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMemberByToken.schema.ts b/packages/trpc/server/routers/viewer/teams/inviteMemberByToken.schema.ts
index 910e559503..1bcff0e3ba 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMemberByToken.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMemberByToken.schema.ts
@@ -2,9 +2,12 @@ import { z } from "zod";
 
 import { CreationSource } from "@calcom/prisma/enums";
 
-export const ZInviteMemberByTokenSchemaInputSchema = z.object({
+export type TInviteMemberByTokenSchemaInputSchema = {
+  token: string;
+  creationSource: CreationSource;
+};
+
+export const ZInviteMemberByTokenSchemaInputSchema: z.ZodType<TInviteMemberByTokenSchemaInputSchema> = z.object({
   token: z.string(),
   creationSource: z.nativeEnum(CreationSource),
 });
-
-export type TInviteMemberByTokenSchemaInputSchema = z.infer<typeof ZInviteMemberByTokenSchemaInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/listMembers.schema.ts b/packages/trpc/server/routers/viewer/teams/listMembers.schema.ts
index c8b78ad41f..55ff17d0f4 100644
--- a/packages/trpc/server/routers/viewer/teams/listMembers.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/listMembers.schema.ts
@@ -1,10 +1,24 @@
 import { z } from "zod";
 
-export const ZListMembersInputSchema = z.object({
+// Note: limit has .default(10), so input type has it optional but output type has it required
+
+export type TListMembersInputSchemaInput = {
+  teamId: number;
+  limit?: number;
+  searchTerm?: string;
+  cursor?: number | null;
+};
+
+export type TListMembersInputSchema = {
+  teamId: number;
+  limit: number;
+  searchTerm?: string;
+  cursor?: number | null;
+};
+
+export const ZListMembersInputSchema: z.ZodType<TListMembersInputSchema, z.ZodTypeDef, TListMembersInputSchemaInput> = z.object({
   teamId: z.number(),
   limit: z.number().default(10),
   searchTerm: z.string().optional(),
   cursor: z.number().optional().nullable(),
 });
-
-export type TListMembersInputSchema = z.infer<typeof ZListMembersInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/managedEvents/managedEventManualReassign.schema.ts b/packages/trpc/server/routers/viewer/teams/managedEvents/managedEventManualReassign.schema.ts
index 514e31e200..c1553b43a2 100644
--- a/packages/trpc/server/routers/viewer/teams/managedEvents/managedEventManualReassign.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/managedEvents/managedEventManualReassign.schema.ts
@@ -1,12 +1,15 @@
 import { z } from "zod";
 
-export const ZManagedEventManualReassignInputSchema = z.object({
-  bookingId: z.number().int(),
-  teamMemberId: z.number().int(),
-  reassignReason: z.string().optional(),
-});
+export type TManagedEventManualReassignInputSchema = {
+  bookingId: number;
+  teamMemberId: number;
+  reassignReason?: string;
+};
 
-export type TManagedEventManualReassignInputSchema = z.infer<
-  typeof ZManagedEventManualReassignInputSchema
->;
+export const ZManagedEventManualReassignInputSchema: z.ZodType<TManagedEventManualReassignInputSchema> =
+  z.object({
+    bookingId: z.number().int(),
+    teamMemberId: z.number().int(),
+    reassignReason: z.string().optional(),
+  });
 
diff --git a/packages/trpc/server/routers/viewer/teams/managedEvents/managedEventReassign.schema.ts b/packages/trpc/server/routers/viewer/teams/managedEvents/managedEventReassign.schema.ts
index 25ee600ff8..b0b852d21a 100644
--- a/packages/trpc/server/routers/viewer/teams/managedEvents/managedEventReassign.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/managedEvents/managedEventReassign.schema.ts
@@ -1,8 +1,10 @@
 import { z } from "zod";
 
-export const ZManagedEventReassignInputSchema = z.object({
+export type TManagedEventReassignInputSchema = {
+  bookingId: number;
+};
+
+export const ZManagedEventReassignInputSchema: z.ZodType<TManagedEventReassignInputSchema> = z.object({
   bookingId: z.number().int(),
 });
 
-export type TManagedEventReassignInputSchema = z.infer<typeof ZManagedEventReassignInputSchema>;
-
diff --git a/packages/trpc/server/routers/viewer/teams/publish.schema.ts b/packages/trpc/server/routers/viewer/teams/publish.schema.ts
index feb45a8372..277ea2d88e 100644
--- a/packages/trpc/server/routers/viewer/teams/publish.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/publish.schema.ts
@@ -1,7 +1,13 @@
 import { z } from "zod";
 
-export const ZPublishInputSchema = z.object({
+export type TPublishInputRawSchema = {
+  teamId: string | number;
+};
+
+export type TPublishInputSchema = {
+  teamId: number;
+};
+
+export const ZPublishInputSchema: z.ZodType<TPublishInputSchema, z.ZodTypeDef, TPublishInputRawSchema> = z.object({
   teamId: z.coerce.number(),
 });
-
-export type TPublishInputSchema = z.infer<typeof ZPublishInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/removeHostsFromEventTypes.schema.ts b/packages/trpc/server/routers/viewer/teams/removeHostsFromEventTypes.schema.ts
index f00007091d..9313dff7f2 100644
--- a/packages/trpc/server/routers/viewer/teams/removeHostsFromEventTypes.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/removeHostsFromEventTypes.schema.ts
@@ -1,9 +1,13 @@
 import { z } from "zod";
 
-export const ZRemoveHostsFromEventTypes = z.object({
+export type TRemoveHostsFromEventTypes = {
+  userIds: number[];
+  teamId: number;
+  eventTypeIds: number[];
+};
+
+export const ZRemoveHostsFromEventTypes: z.ZodType<TRemoveHostsFromEventTypes> = z.object({
   userIds: z.array(z.number()),
   teamId: z.number(),
   eventTypeIds: z.array(z.number()),
 });
-
-export type TRemoveHostsFromEventTypes = z.infer<typeof ZRemoveHostsFromEventTypes>;
diff --git a/packages/trpc/server/routers/viewer/teams/removeMember.schema.ts b/packages/trpc/server/routers/viewer/teams/removeMember.schema.ts
index 9a96b80109..56c3a629dd 100644
--- a/packages/trpc/server/routers/viewer/teams/removeMember.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/removeMember.schema.ts
@@ -1,9 +1,21 @@
 import { z } from "zod";
 
-export const ZRemoveMemberInputSchema = z.object({
+// Note: isOrg has .default(false), so input type has it optional but output type has it required
+
+export type TRemoveMemberInputSchemaInput = {
+  teamIds: number[];
+  memberIds: number[];
+  isOrg?: boolean;
+};
+
+export type TRemoveMemberInputSchema = {
+  teamIds: number[];
+  memberIds: number[];
+  isOrg: boolean;
+};
+
+export const ZRemoveMemberInputSchema: z.ZodType<TRemoveMemberInputSchema, z.ZodTypeDef, TRemoveMemberInputSchemaInput> = z.object({
   teamIds: z.array(z.number()),
   memberIds: z.array(z.number()),
   isOrg: z.boolean().default(false),
 });
-
-export type TRemoveMemberInputSchema = z.infer<typeof ZRemoveMemberInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/resendInvitation.schema.ts b/packages/trpc/server/routers/viewer/teams/resendInvitation.schema.ts
index a98ffd635a..61449b01de 100644
--- a/packages/trpc/server/routers/viewer/teams/resendInvitation.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/resendInvitation.schema.ts
@@ -2,11 +2,23 @@ import { z } from "zod";
 
 import { emailSchema } from "@calcom/lib/emailSchema";
 
-export const ZResendInvitationInputSchema = z.object({
+export type TResendInvitationInputSchemaInput = {
+  teamId: number;
+  email: string;
+  language: string;
+  isOrg?: boolean;
+};
+
+export type TResendInvitationInputSchema = {
+  teamId: number;
+  email: string;
+  language: string;
+  isOrg: boolean;
+};
+
+export const ZResendInvitationInputSchema: z.ZodType<TResendInvitationInputSchema, z.ZodTypeDef, TResendInvitationInputSchemaInput> = z.object({
   teamId: z.number(),
   email: emailSchema,
   language: z.string(),
   isOrg: z.boolean().default(false),
 });
-
-export type TResendInvitationInputSchema = z.infer<typeof ZResendInvitationInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/roundRobin/getRoundRobinHostsToReasign.schema.ts b/packages/trpc/server/routers/viewer/teams/roundRobin/getRoundRobinHostsToReasign.schema.ts
index 2860a3d099..fc82bb9533 100644
--- a/packages/trpc/server/routers/viewer/teams/roundRobin/getRoundRobinHostsToReasign.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/roundRobin/getRoundRobinHostsToReasign.schema.ts
@@ -1,12 +1,17 @@
 import { z } from "zod";
 
-// New schema for fetching hosts
-export const ZGetRoundRobinHostsInputSchema = z.object({
+export type TGetRoundRobinHostsToReassignInputSchema = {
+  bookingId: number;
+  exclude: "fixedHosts";
+  cursor?: number;
+  limit?: number;
+  searchTerm?: string;
+};
+
+export const ZGetRoundRobinHostsInputSchema: z.ZodType<TGetRoundRobinHostsToReassignInputSchema> = z.object({
   bookingId: z.number(),
   exclude: z.literal("fixedHosts"),
-  cursor: z.number().optional(), // For pagination
+  cursor: z.number().optional(),
   limit: z.number().min(1).max(100).optional(),
   searchTerm: z.string().optional(),
 });
-
-export type TGetRoundRobinHostsToReassignInputSchema = z.infer<typeof ZGetRoundRobinHostsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinManualReassign.schema.ts b/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinManualReassign.schema.ts
index c6840cd2f2..42641c23b4 100644
--- a/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinManualReassign.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinManualReassign.schema.ts
@@ -1,9 +1,13 @@
 import { z } from "zod";
 
-export const ZRoundRobinManualReassignInputSchema = z.object({
+export type TRoundRobinManualReassignInputSchema = {
+  bookingId: number;
+  teamMemberId: number;
+  reassignReason?: string;
+};
+
+export const ZRoundRobinManualReassignInputSchema: z.ZodType<TRoundRobinManualReassignInputSchema> = z.object({
   bookingId: z.number(),
   teamMemberId: z.number(),
   reassignReason: z.string().optional(),
 });
-
-export type TRoundRobinManualReassignInputSchema = z.infer<typeof ZRoundRobinManualReassignInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinReassign.schema.ts b/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinReassign.schema.ts
index 3894f90b09..2c2caabf00 100644
--- a/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinReassign.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/roundRobin/roundRobinReassign.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZRoundRobinReassignInputSchema = z.object({
+export type TRoundRobinReassignInputSchema = {
+  teamId: number;
+  bookingId: number;
+};
+
+export const ZRoundRobinReassignInputSchema: z.ZodType<TRoundRobinReassignInputSchema> = z.object({
   teamId: z.number(),
   bookingId: z.number(),
 });
-
-export type TRoundRobinReassignInputSchema = z.infer<typeof ZRoundRobinReassignInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/setInviteExpiration.schema.ts b/packages/trpc/server/routers/viewer/teams/setInviteExpiration.schema.ts
index 2295ff4bdc..d14ba19e67 100644
--- a/packages/trpc/server/routers/viewer/teams/setInviteExpiration.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/setInviteExpiration.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZSetInviteExpirationInputSchema = z.object({
+export type TSetInviteExpirationInputSchema = {
+  token: string;
+  expiresInDays?: number;
+};
+
+export const ZSetInviteExpirationInputSchema: z.ZodType<TSetInviteExpirationInputSchema> = z.object({
   token: z.string(),
   expiresInDays: z.number().optional(),
 });
-
-export type TSetInviteExpirationInputSchema = z.infer<typeof ZSetInviteExpirationInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/updateInternalNotesPresets.schema.ts b/packages/trpc/server/routers/viewer/teams/updateInternalNotesPresets.schema.ts
index 9a24db8d05..e4a9c6ba5f 100644
--- a/packages/trpc/server/routers/viewer/teams/updateInternalNotesPresets.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/updateInternalNotesPresets.schema.ts
@@ -1,6 +1,15 @@
 import { z } from "zod";
 
-export const ZUpdateInternalNotesPresetsInputSchema = z.object({
+export type TUpdateInternalNotesPresetsInputSchema = {
+  teamId: number;
+  presets: {
+    id: number;
+    name: string;
+    cancellationReason?: string;
+  }[];
+};
+
+export const ZUpdateInternalNotesPresetsInputSchema: z.ZodType<TUpdateInternalNotesPresetsInputSchema> = z.object({
   teamId: z.number(),
   presets: z.array(
     z.object({
@@ -10,5 +19,3 @@ export const ZUpdateInternalNotesPresetsInputSchema = z.object({
     })
   ),
 });
-
-export type TUpdateInternalNotesPresetsInputSchema = z.infer<typeof ZUpdateInternalNotesPresetsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/teams/updateMembership.schema.ts b/packages/trpc/server/routers/viewer/teams/updateMembership.schema.ts
index 702aba5fcd..0ae4189724 100644
--- a/packages/trpc/server/routers/viewer/teams/updateMembership.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/updateMembership.schema.ts
@@ -1,9 +1,13 @@
 import { z } from "zod";
 
-export const ZUpdateMembershipInputSchema = z.object({
+export type TUpdateMembershipInputSchema = {
+  teamId: number;
+  memberId: number;
+  disableImpersonation: boolean;
+};
+
+export const ZUpdateMembershipInputSchema: z.ZodType<TUpdateMembershipInputSchema> = z.object({
   teamId: z.number(),
   memberId: z.number(),
   disableImpersonation: z.boolean(),
 });
-
-export type TUpdateMembershipInputSchema = z.infer<typeof ZUpdateMembershipInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/activateEventType.schema.ts b/packages/trpc/server/routers/viewer/workflows/activateEventType.schema.ts
index 78446e3b8d..22b955b52b 100644
--- a/packages/trpc/server/routers/viewer/workflows/activateEventType.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/activateEventType.schema.ts
@@ -1,8 +1,11 @@
 import { z } from "zod";
 
-export const ZActivateEventTypeInputSchema = z.object({
+export type TActivateEventTypeInputSchema = {
+  eventTypeId: number;
+  workflowId: number;
+};
+
+export const ZActivateEventTypeInputSchema: z.ZodType<TActivateEventTypeInputSchema> = z.object({
   eventTypeId: z.number(),
   workflowId: z.number(),
 });
-
-export type TActivateEventTypeInputSchema = z.infer<typeof ZActivateEventTypeInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/create.schema.ts b/packages/trpc/server/routers/viewer/workflows/create.schema.ts
index 2dbc2bcbfa..d937d0cf56 100644
--- a/packages/trpc/server/routers/viewer/workflows/create.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/create.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZCreateInputSchema = z.object({
+export type TCreateInputSchema = {
+  teamId?: number;
+};
+
+export const ZCreateInputSchema: z.ZodType<TCreateInputSchema> = z.object({
   teamId: z.number().optional(),
 });
-
-export type TCreateInputSchema = z.infer<typeof ZCreateInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/delete.schema.ts b/packages/trpc/server/routers/viewer/workflows/delete.schema.ts
index 411d5e953b..519daf0dd8 100644
--- a/packages/trpc/server/routers/viewer/workflows/delete.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/delete.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZDeleteInputSchema = z.object({
+export type TDeleteInputSchema = {
+  id: number;
+};
+
+export const ZDeleteInputSchema: z.ZodType<TDeleteInputSchema> = z.object({
   id: z.number(),
 });
-
-export type TDeleteInputSchema = z.infer<typeof ZDeleteInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/getAllActiveWorkflows.schema.ts b/packages/trpc/server/routers/viewer/workflows/getAllActiveWorkflows.schema.ts
index 432dbec879..045c589bee 100644
--- a/packages/trpc/server/routers/viewer/workflows/getAllActiveWorkflows.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/getAllActiveWorkflows.schema.ts
@@ -8,7 +8,31 @@ import {
 } from "@calcom/ee/workflows/lib/constants";
 import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 
-export const ZWorkflow = z.object({
+// Define types first to use with z.ZodType annotations
+type TWorkflow = {
+  id: number;
+  name: string;
+  trigger: (typeof WORKFLOW_TRIGGER_EVENTS)[number];
+  time: number | null;
+  timeUnit: (typeof TIME_UNIT)[number] | null;
+  userId: number | null;
+  teamId: number | null;
+  steps: {
+    id: number;
+    action: (typeof WORKFLOW_ACTIONS)[number];
+    sendTo: string | null;
+    template: (typeof WORKFLOW_TEMPLATES)[number];
+    reminderBody: string | null;
+    emailSubject: string | null;
+    numberRequired: boolean | null;
+    sender: string | null;
+    includeCalendarEvent: boolean;
+    numberVerificationPending: boolean;
+    verifiedAt?: Date | null;
+  }[];
+};
+
+export const ZWorkflow: z.ZodType<TWorkflow> = z.object({
   id: z.number(),
   name: z.string(),
   trigger: z.enum(WORKFLOW_TRIGGER_EVENTS),
@@ -33,14 +57,29 @@ export const ZWorkflow = z.object({
     .array(),
 });
 
-export const ZWorkflows = z
+type TWorkflows = { workflow: TWorkflow }[] | undefined;
+
+export const ZWorkflows: z.ZodType<TWorkflows> = z
   .object({
     workflow: ZWorkflow,
   })
   .array()
   .optional();
 
-export const ZGetAllActiveWorkflowsInputSchema = z.object({
+export type TGetAllActiveWorkflowsInputSchema = {
+  eventType: {
+    id: number;
+    teamId?: number | null;
+    parent?: {
+      id: number | null;
+      teamId: number | null;
+    } | null;
+    metadata: z.infer<typeof EventTypeMetaDataSchema>;
+    userId?: number | null;
+  };
+};
+
+export const ZGetAllActiveWorkflowsInputSchema: z.ZodType<TGetAllActiveWorkflowsInputSchema> = z.object({
   eventType: z.object({
     id: z.number(),
     teamId: z.number().optional().nullable(),
@@ -55,5 +94,3 @@ export const ZGetAllActiveWorkflowsInputSchema = z.object({
     userId: z.number().optional().nullable(),
   }),
 });
-
-export type TGetAllActiveWorkflowsInputSchema = z.infer<typeof ZGetAllActiveWorkflowsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/getVerifiedEmails.schema.ts b/packages/trpc/server/routers/viewer/workflows/getVerifiedEmails.schema.ts
index 82c1fd49e3..2d75c96eda 100644
--- a/packages/trpc/server/routers/viewer/workflows/getVerifiedEmails.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/getVerifiedEmails.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZGetVerifiedEmailsInputSchema = z.object({
+export type TGetVerifiedEmailsInputSchema = {
+  teamId?: number;
+};
+
+export const ZGetVerifiedEmailsInputSchema: z.ZodType<TGetVerifiedEmailsInputSchema> = z.object({
   teamId: z.number().optional(),
 });
-
-export type TGetVerifiedEmailsInputSchema = z.infer<typeof ZGetVerifiedEmailsInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/getVerifiedNumbers.schema.ts b/packages/trpc/server/routers/viewer/workflows/getVerifiedNumbers.schema.ts
index 032231919e..1794b5961c 100644
--- a/packages/trpc/server/routers/viewer/workflows/getVerifiedNumbers.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/getVerifiedNumbers.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZGetVerifiedNumbersInputSchema = z.object({
+export type TGetVerifiedNumbersInputSchema = {
+  teamId?: number;
+};
+
+export const ZGetVerifiedNumbersInputSchema: z.ZodType<TGetVerifiedNumbersInputSchema> = z.object({
   teamId: z.number().optional(),
 });
-
-export type TGetVerifiedNumbersInputSchema = z.infer<typeof ZGetVerifiedNumbersInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/list.schema.ts b/packages/trpc/server/routers/viewer/workflows/list.schema.ts
index e02dd529c2..507c2e0893 100644
--- a/packages/trpc/server/routers/viewer/workflows/list.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/list.schema.ts
@@ -1,9 +1,13 @@
 import { z } from "zod";
 
-export const ZListInputSchema = z.object({
+export type TListInputSchema = {
+  teamId?: number;
+  userId?: number;
+  includeOnlyEventTypeWorkflows: boolean;
+};
+
+export const ZListInputSchema: z.ZodType<TListInputSchema> = z.object({
   teamId: z.number().optional(),
   userId: z.number().optional(),
   includeOnlyEventTypeWorkflows: z.boolean(),
 });
-
-export type TListInputSchema = z.infer<typeof ZListInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/sendVerificationCode.schema.ts b/packages/trpc/server/routers/viewer/workflows/sendVerificationCode.schema.ts
index 8def3a8b33..27ce2b33aa 100644
--- a/packages/trpc/server/routers/viewer/workflows/sendVerificationCode.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/sendVerificationCode.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZSendVerificationCodeInputSchema = z.object({
+export type TSendVerificationCodeInputSchema = {
+  phoneNumber: string;
+};
+
+export const ZSendVerificationCodeInputSchema: z.ZodType<TSendVerificationCodeInputSchema> = z.object({
   phoneNumber: z.string(),
 });
-
-export type TSendVerificationCodeInputSchema = z.infer<typeof ZSendVerificationCodeInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/verifyEmailCode.schema.ts b/packages/trpc/server/routers/viewer/workflows/verifyEmailCode.schema.ts
index 496cc1a6cf..c15fe9a0ed 100644
--- a/packages/trpc/server/routers/viewer/workflows/verifyEmailCode.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/verifyEmailCode.schema.ts
@@ -1,9 +1,13 @@
 import { z } from "zod";
 
-export const ZVerifyEmailCodeInputSchema = z.object({
+export type TVerifyEmailCodeInputSchema = {
+  teamId?: number;
+  code: string;
+  email: string;
+};
+
+export const ZVerifyEmailCodeInputSchema: z.ZodType<TVerifyEmailCodeInputSchema> = z.object({
   teamId: z.number().optional(),
   code: z.string(),
   email: z.string(),
 });
-
-export type TVerifyEmailCodeInputSchema = z.infer<typeof ZVerifyEmailCodeInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/verifyPhoneNumber.schema.ts b/packages/trpc/server/routers/viewer/workflows/verifyPhoneNumber.schema.ts
index fb3a02537b..96ca50ab53 100644
--- a/packages/trpc/server/routers/viewer/workflows/verifyPhoneNumber.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/verifyPhoneNumber.schema.ts
@@ -1,9 +1,13 @@
 import { z } from "zod";
 
-export const ZVerifyPhoneNumberInputSchema = z.object({
+export type TVerifyPhoneNumberInputSchema = {
+  phoneNumber: string;
+  code: string;
+  teamId?: number;
+};
+
+export const ZVerifyPhoneNumberInputSchema: z.ZodType<TVerifyPhoneNumberInputSchema> = z.object({
   phoneNumber: z.string(),
   code: z.string(),
   teamId: z.number().optional(),
 });
-
-export type TVerifyPhoneNumberInputSchema = z.infer<typeof ZVerifyPhoneNumberInputSchema>;
diff --git a/packages/trpc/server/routers/viewer/workflows/workflowOrder.schema.ts b/packages/trpc/server/routers/viewer/workflows/workflowOrder.schema.ts
index 695c0a56e1..9409c19004 100644
--- a/packages/trpc/server/routers/viewer/workflows/workflowOrder.schema.ts
+++ b/packages/trpc/server/routers/viewer/workflows/workflowOrder.schema.ts
@@ -1,7 +1,9 @@
 import { z } from "zod";
 
-export const ZWorkflowOrderInputSchema = z.object({
+export type TWorkflowOrderInputSchema = {
+  ids: number[];
+};
+
+export const ZWorkflowOrderInputSchema: z.ZodType<TWorkflowOrderInputSchema> = z.object({
   ids: z.array(z.number()),
 });
-
-export type TWorkflowOrderInputSchema = z.infer<typeof ZWorkflowOrderInputSchema>;