diff --git a/packages/platform/examples/base/src/pages/_app.tsx b/packages/platform/examples/base/src/pages/_app.tsx
index d35433c5841269..88c5e9866ed43a 100644
--- a/packages/platform/examples/base/src/pages/_app.tsx
+++ b/packages/platform/examples/base/src/pages/_app.tsx
@@ -83,7 +83,11 @@ export default function App({ Component, pageProps }: AppProps) {
   return (
     <div className={`${poppins.className} text-black`}>
       {options.length > 0 && (
-        <Select defaultValue={selectedUser} onChange={setSelectedUser} options={options} />
+        <Select
+          defaultValue={options.find((opt: TUser | null) => opt?.email.includes("lauris"))}
+          onChange={(opt: TUser | null) => setSelectedUser(opt)}
+          options={options}
+        />
       )}
       <CalProvider
         accessToken={accessToken}
diff --git a/packages/platform/examples/base/src/pages/api/managed-user.ts b/packages/platform/examples/base/src/pages/api/managed-user.ts
index ee6013ac3bcbfc..6e551ecfc608f4 100644
--- a/packages/platform/examples/base/src/pages/api/managed-user.ts
+++ b/packages/platform/examples/base/src/pages/api/managed-user.ts
@@ -111,10 +111,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     throw new Error("Failed to create team. Probably your platform team does not have required plan.");
   }
 
-  await createOrgTeamMembershipMember(+organizationId, team.id, managedUserResponseOne.user.id);
-  await createOrgTeamMembershipMember(+organizationId, team.id, managedUserResponseTwo.user.id);
-  await createOrgTeamMembershipMember(+organizationId, team.id, managedUserResponseThree.user.id);
-  await createOrgTeamMembershipMember(+organizationId, team.id, managedUserResponseFour.user.id);
+  await createOrgTeamMembershipMember(+organizationId, team.id, managedUserResponseOne.user.id, "MEMBER");
+  await createOrgTeamMembershipMember(+organizationId, team.id, managedUserResponseTwo.user.id, "MEMBER");
+  await createOrgTeamMembershipMember(+organizationId, team.id, managedUserResponseThree.user.id, "MEMBER");
+  await createOrgTeamMembershipMember(+organizationId, team.id, managedUserResponseFour.user.id, "MEMBER");
 
   await createCollectiveEventType(+organizationId, team.id, [
     managedUserResponseOne.user.id,
@@ -133,10 +133,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
   await createOrgMembershipAdmin(+organizationId, managedUserResponseFive.user.id);
 
   return res.status(200).json({
-    id: managedUserResponseOne?.user?.id,
-    email: (managedUserResponseOne.user.email as string) ?? "",
-    username: (managedUserResponseOne.user.username as string) ?? "",
-    accessToken: (managedUserResponseOne.accessToken as string) ?? "",
+    id: managedUserResponseFive?.user?.id,
+    email: (managedUserResponseFive.user.email as string) ?? "",
+    username: (managedUserResponseFive.user.username as string) ?? "",
+    accessToken: (managedUserResponseFive.accessToken as string) ?? "",
   });
 }
 
@@ -165,7 +165,12 @@ async function createTeam(orgId: number, name: string) {
   return body.data;
 }
 
-async function createOrgTeamMembershipMember(orgId: number, teamId: number, userId: number) {
+async function createOrgTeamMembershipMember(
+  orgId: number,
+  teamId: number,
+  userId: number,
+  role: "MEMBER" | "ADMIN" = "MEMBER"
+) {
   await fetch(
     // eslint-disable-next-line turbo/no-undeclared-env-vars
     `${process.env.NEXT_PUBLIC_CALCOM_API_URL ?? ""}/organizations/${orgId}/teams/${teamId}/memberships`,
@@ -182,7 +187,7 @@ async function createOrgTeamMembershipMember(orgId: number, teamId: number, user
       body: JSON.stringify({
         userId,
         accepted: true,
-        role: "MEMBER",
+        role,
       }),
     }
   );
diff --git a/packages/platform/examples/base/tests/create-team-event-type-atom/create-team-event-type.e2e.ts b/packages/platform/examples/base/tests/create-team-event-type-atom/create-team-event-type.e2e.ts
index 6253cbb963e1e0..f2c350b278b7d4 100644
--- a/packages/platform/examples/base/tests/create-team-event-type-atom/create-team-event-type.e2e.ts
+++ b/packages/platform/examples/base/tests/create-team-event-type-atom/create-team-event-type.e2e.ts
@@ -3,7 +3,7 @@ import { test, expect } from "@playwright/test";
 import { generateRandomText } from "../../src/lib/generateRandomText";
 
 // eslint-disable-next-line playwright/no-skipped-test
-test.skip("create team event using CreateTeamEventTypeAtom", async ({ page }) => {
+test("create team event using CreateTeamEventTypeAtom", async ({ page }) => {
   await page.goto("/");
 
   await page.goto("/event-types");
diff --git a/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts
index e7c2461021494c..8173fe6da9c80b 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts
@@ -60,7 +60,7 @@ export const createHandler = async ({ ctx, input }: CreateOptions) => {
 
   if (ctx.user.organizationId) {
     try {
-      const orgPermissions = await getResourcePermissions({
+      /* const orgPermissions = await getResourcePermissions({
         userId,
         teamId: ctx.user.organizationId,
         resource: Resource.EventType,
@@ -71,7 +71,8 @@ export const createHandler = async ({ ctx, input }: CreateOptions) => {
           },
         },
       });
-      hasOrgEventTypeCreatePermission = orgPermissions.canCreate;
+      hasOrgEventTypeCreatePermission = orgPermissions.canCreate; */
+      hasOrgEventTypeCreatePermission = isOrgAdmin;
     } catch (error) {
       // If PBAC check fails, fall back to isOrgAdmin
       hasOrgEventTypeCreatePermission = isOrgAdmin;