diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/FlowPolicyNode.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/FlowPolicyNode.tsx
index 4b239b896..2d392334f 100644
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/FlowPolicyNode.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/FlowPolicyNode.tsx
@@ -32,9 +32,8 @@ import { api } from "~/trpc/react";
 const ApprovalDialog: React.FC<{
   releaseId: string;
   policyId: string;
-  userId: string;
   children: React.ReactNode;
-}> = ({ releaseId, policyId, userId, children }) => {
+}> = ({ releaseId, policyId, children }) => {
   const approve = api.environment.policy.approval.approve.useMutation();
   const rejected = api.environment.policy.approval.reject.useMutation();
   const router = useRouter();
@@ -52,7 +51,7 @@ const ApprovalDialog: React.FC<{
         <AlertDialogFooter>
           <AlertDialogCancel
             onClick={async () => {
-              await rejected.mutateAsync({ releaseId, policyId, userId });
+              await rejected.mutateAsync({ releaseId, policyId });
               router.refresh();
             }}
           >
@@ -60,7 +59,7 @@ const ApprovalDialog: React.FC<{
           </AlertDialogCancel>
           <AlertDialogAction
             onClick={async () => {
-              await approve.mutateAsync({ releaseId, policyId, userId });
+              await approve.mutateAsync({ releaseId, policyId });
               router.refresh();
             }}
           >
@@ -191,11 +190,7 @@ const ApprovalCheck: React.FC<PolicyNodeProps["data"]> = ({ id, release }) => {
   }
   const status = approval.data?.status;
   return (
-    <ApprovalDialog
-      policyId={id}
-      releaseId={release.id}
-      userId={approval.data?.userId ?? ""}
-    >
+    <ApprovalDialog policyId={id} releaseId={release.id}>
       <button
         disabled={status === "approved" || status === "rejected"}
         className="flex w-full items-center gap-2 rounded-md hover:bg-neutral-800/50"
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/PolicyApprovalRow.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/PolicyApprovalRow.tsx
index 0c57e361d..d276c999d 100644
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/PolicyApprovalRow.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/PolicyApprovalRow.tsx
@@ -31,7 +31,6 @@ export const PolicyApprovalRow: React.FC<PolicyApprovalRowProps> = ({
 
   const environmentName = environment.name;
   const { releaseId, policyId, status } = approval;
-  const currentUserId = api.user.viewer.useQuery().data?.id;
 
   const rejectMutation = api.environment.policy.approval.reject.useMutation({
     onSuccess: ({ cancelledJobCount }) => {
@@ -59,13 +58,11 @@ export const PolicyApprovalRow: React.FC<PolicyApprovalRowProps> = ({
     rejectMutation.mutate({
       releaseId,
       policyId,
-      userId: currentUserId!,
     });
   const handleApprove = () =>
     approveMutation.mutate({
       releaseId,
       policyId,
-      userId: currentUserId!,
     });
 
   return (
diff --git a/packages/api/src/router/environment.ts b/packages/api/src/router/environment.ts
index b090c02c8..a7b34bddd 100644
--- a/packages/api/src/router/environment.ts
+++ b/packages/api/src/router/environment.ts
@@ -165,13 +165,12 @@ const policyRouter = createTRPCRouter({
         z.object({
           policyId: z.string().uuid(),
           releaseId: z.string().uuid(),
-          userId: z.string().uuid(),
         }),
       )
       .mutation(async ({ ctx, input }) => {
         const envApproval = await ctx.db
           .update(environmentPolicyApproval)
-          .set({ status: "approved", userId: input.userId })
+          .set({ status: "approved", userId: ctx.session.user.id })
           .where(
             and(
               eq(environmentPolicyApproval.policyId, input.policyId),
@@ -225,14 +224,13 @@ const policyRouter = createTRPCRouter({
         z.object({
           releaseId: z.string().uuid(),
           policyId: z.string().uuid(),
-          userId: z.string().uuid(),
         }),
       )
       .mutation(({ ctx, input }) =>
         ctx.db.transaction(async (tx) => {
           await tx
             .update(environmentPolicyApproval)
-            .set({ status: "rejected", userId: input.userId })
+            .set({ status: "rejected", userId: ctx.session.user.id })
             .where(
               and(
                 eq(environmentPolicyApproval.policyId, input.policyId),