diff --git a/client/src/pages/teams/TeamMemberConfig.tsx b/client/src/pages/teams/TeamMemberConfig.tsx
index 131e79c77..e6def8a64 100644
--- a/client/src/pages/teams/TeamMemberConfig.tsx
+++ b/client/src/pages/teams/TeamMemberConfig.tsx
@@ -13,6 +13,7 @@ import { mutate } from "swr";
 import type { IUser } from "@/types/user";
 import { useAppDispatch } from "@/hooks/AppHooks";
 import { setUser } from "@/features/authSlice";
+import type { FormValues } from "@/pages/teams/TeamMemberForm";
 
 const TeamMemberConfig = () => {
   const [dialogOpen, setDialogOpen] = useState<boolean>(false);
@@ -20,7 +21,7 @@ const TeamMemberConfig = () => {
   const navigate = useNavigate();
   const { t } = useTranslation();
   const { id, memberId } = useParams();
-  const { patch, loading } = usePatch();
+  const { patch, loading } = usePatch<Partial<FormValues>, any>();
   const { get: getOnDemand } = useGetOnDemand<IUser>();
   const dispatch = useAppDispatch();
   const { response } = useGet<ApiResponse<any>>("/team-members");
diff --git a/client/src/pages/teams/TeamMemberCreate.tsx b/client/src/pages/teams/TeamMemberCreate.tsx
index 873c9913c..92b477605 100644
--- a/client/src/pages/teams/TeamMemberCreate.tsx
+++ b/client/src/pages/teams/TeamMemberCreate.tsx
@@ -9,6 +9,7 @@ import { useGetOnDemand } from "@/hooks/UseApi";
 import type { IUser } from "@/types/user";
 import { useAppDispatch } from "@/hooks/AppHooks";
 import { setUser } from "@/features/authSlice";
+import type { FormValues } from "@/pages/teams/TeamMemberForm";
 const TeamMemberCreate = () => {
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
@@ -17,7 +18,7 @@ const TeamMemberCreate = () => {
   const { response } = useGet<ApiResponse<any>>("/team-members?type=org");
   const { response: rolesResponse } =
     useGet<ApiResponse<any>>("/roles?type=team");
-  const { post } = usePost<ApiResponse<any>>();
+  const { post } = usePost<FormValues>();
   const teamMembers = response?.data || [];
   const roles = rolesResponse?.data || [];
 
diff --git a/client/src/pages/teams/TeamMemberForm.tsx b/client/src/pages/teams/TeamMemberForm.tsx
index 5595da417..fd8faafa3 100644
--- a/client/src/pages/teams/TeamMemberForm.tsx
+++ b/client/src/pages/teams/TeamMemberForm.tsx
@@ -14,7 +14,7 @@ import { useForm, Controller, type SubmitHandler } from "react-hook-form";
 import { useEffect } from "react";
 import { useInitForm } from "@/hooks/forms/UseInitTeamMemberForm";
 
-type FormValues = z.infer<typeof teamMemberSchema>;
+export type FormValues = z.infer<typeof teamMemberSchema>;
 
 export const TeamMemberForm = ({
   mode = "create",
diff --git a/client/src/pages/teams/TeamsConfig.tsx b/client/src/pages/teams/TeamsConfig.tsx
index 6636e79e8..1d836b003 100644
--- a/client/src/pages/teams/TeamsConfig.tsx
+++ b/client/src/pages/teams/TeamsConfig.tsx
@@ -1,20 +1,18 @@
 import { TeamsForm } from "@/pages/teams/TeamsForm";
 
 import { useNavigate, useParams } from "react-router";
-import { z } from "zod";
-import { teamSchema } from "@/validation";
 import { useGet, usePatch, useGetOnDemand } from "@/hooks/UseApi";
 import type { ApiResponse } from "@/types/api";
 import type { IUser } from "@/types/user";
 import { useAppDispatch } from "@/hooks/AppHooks";
 import { setUser } from "@/features/authSlice";
 import { mutate } from "swr";
+import type { FormValues } from "@/pages/teams/TeamsForm";
 
 const TeamsConfigPage = () => {
-  type FormValues = Omit<z.infer<typeof teamSchema>, "roleId">;
   const navigate = useNavigate();
   const { response } = useGet<ApiResponse<any>>("/roles?type=team");
-  const { patch, loading } = usePatch<FormValues, ApiResponse<any>>();
+  const { patch, loading } = usePatch<Partial<FormValues>, ApiResponse<any>>();
   const { get: getOnDemand } = useGetOnDemand<IUser>();
   const dispatch = useAppDispatch();
 
diff --git a/client/src/pages/teams/TeamsCreate.tsx b/client/src/pages/teams/TeamsCreate.tsx
index 7138a296d..1d351af32 100644
--- a/client/src/pages/teams/TeamsCreate.tsx
+++ b/client/src/pages/teams/TeamsCreate.tsx
@@ -1,17 +1,15 @@
 import { TeamsForm } from "@/pages/teams/TeamsForm";
 
 import { useNavigate } from "react-router";
-import { z } from "zod";
-import { teamSchema } from "@/validation";
 import { useGet, usePost, useGetOnDemand } from "@/hooks/UseApi";
 import type { ApiResponse } from "@/types/api";
 import { mutate } from "swr";
 import type { IUser } from "@/types/user";
 import { useAppDispatch } from "@/hooks/AppHooks";
 import { setUser } from "@/features/authSlice";
+import type { FormValues } from "@/pages/teams/TeamsForm";
 
 const TeamsCreatePage = () => {
-  type FormValues = z.infer<typeof teamSchema>;
   const { response } = useGet<ApiResponse<any>>("/roles?type=team");
   const { post, loading } = usePost<FormValues>();
   const navigate = useNavigate();
diff --git a/client/src/pages/teams/TeamsForm.tsx b/client/src/pages/teams/TeamsForm.tsx
index 448476c6b..826953fa0 100644
--- a/client/src/pages/teams/TeamsForm.tsx
+++ b/client/src/pages/teams/TeamsForm.tsx
@@ -14,7 +14,7 @@ import { useForm, Controller, type SubmitHandler } from "react-hook-form";
 import { useEffect } from "react";
 import { useInitForm } from "@/hooks/forms/UseInitTeamsForm";
 
-type FormValues = z.infer<typeof teamSchema>;
+export type FormValues = z.infer<typeof teamSchema>;
 
 export const TeamsForm = ({
   mode = "create",