diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/_components/PolicyTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/_components/PolicyTable.tsx
index 43af7fe51..5c98ab428 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/_components/PolicyTable.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/_components/PolicyTable.tsx
@@ -2,7 +2,8 @@
 
 import type { RouterOutputs } from "@ctrlplane/api";
 import { useState } from "react";
-import { useRouter } from "next/navigation";
+import Link from "next/link";
+import { useParams, useRouter } from "next/navigation";
 import { IconDots, IconPencil, IconTrash } from "@tabler/icons-react";
 
 import { Badge } from "@ctrlplane/ui/badge";
@@ -25,6 +26,7 @@ import {
 import { toast } from "@ctrlplane/ui/toast";
 
 import type { RuleType } from "./rule-themes";
+import { urls } from "~/app/urls";
 import { api } from "~/trpc/react";
 import {
   getRuleTypeIcon,
@@ -56,6 +58,7 @@ interface PolicyTableRowProps {
 }
 
 const PolicyTableRow: React.FC<PolicyTableRowProps> = ({ policy }) => {
+  const { workspaceSlug } = useParams<{ workspaceSlug: string }>();
   const updatePolicy = api.policy.update.useMutation();
   const router = useRouter();
   const [isEnabled, setIsEnabled] = useState(policy.enabled);
@@ -63,6 +66,12 @@ const PolicyTableRow: React.FC<PolicyTableRowProps> = ({ policy }) => {
   const environmentCount = 0;
   const deploymentCount = 0;
 
+  const editUrl = urls
+    .workspace(workspaceSlug)
+    .policies()
+    .edit(policy.id)
+    .baseUrl();
+
   return (
     <TableRow className="group cursor-pointer hover:bg-muted/50">
       {/* Name column */}
@@ -143,10 +152,12 @@ const PolicyTableRow: React.FC<PolicyTableRowProps> = ({ policy }) => {
             </Button>
           </DropdownMenuTrigger>
           <DropdownMenuContent align="end">
-            <DropdownMenuItem className="cursor-pointer">
-              <IconPencil className="mr-2 h-4 w-4" />
-              Edit
-            </DropdownMenuItem>
+            <Link href={editUrl}>
+              <DropdownMenuItem className="cursor-pointer">
+                <IconPencil className="mr-2 h-4 w-4" />
+                Edit
+              </DropdownMenuItem>
+            </Link>
             <DropdownMenuItem className="cursor-pointer text-destructive focus:text-destructive">
               <IconTrash className="mr-2 h-4 w-4" />
               Delete
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/approval-gates/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/approval-gates/page.tsx
index c90cf5e35..4a2dee382 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/approval-gates/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/approval-gates/page.tsx
@@ -120,7 +120,11 @@ const PolicyActionMenu: React.FC<PolicyActionMenuProps> = ({
     <DropdownMenuContent align="end">
       <DropdownMenuItem asChild>
         <Link
-          href={urls.workspace(workspaceSlug).policies().edit(policy.id)}
+          href={urls
+            .workspace(workspaceSlug)
+            .policies()
+            .edit(policy.id)
+            .baseUrl()}
           className="flex cursor-pointer items-center gap-2"
         >
           <IconEdit className="h-4 w-4" />
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/version-conditions/_components/VersionConditionsPoliciesTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/version-conditions/_components/VersionConditionsPoliciesTable.tsx
index 5ce552013..b2e90f0e3 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/version-conditions/_components/VersionConditionsPoliciesTable.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/version-conditions/_components/VersionConditionsPoliciesTable.tsx
@@ -69,7 +69,8 @@ export const VersionConditionsPoliciesTable: React.FC<
                         href={urls
                           .workspace(workspaceSlug)
                           .policies()
-                          .edit(policy.id)}
+                          .edit(policy.id)
+                          .baseUrl()}
                       >
                         <IconExternalLink className="h-4 w-4" />
                         <span className="sr-only">Edit Policy</span>
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/_components/PolicyEditTabs.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/_components/PolicyEditTabs.tsx
new file mode 100644
index 000000000..990366509
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/_components/PolicyEditTabs.tsx
@@ -0,0 +1,95 @@
+"use client";
+
+import Link from "next/link";
+import { useParams, usePathname } from "next/navigation";
+import { IconCircleFilled } from "@tabler/icons-react";
+
+import { cn } from "@ctrlplane/ui";
+
+import type { PolicyTab } from "../../../create/_components/PolicyContext";
+import { urls } from "~/app/urls";
+
+type TabConfig = {
+  id: PolicyTab;
+  label: string;
+  description: string;
+  href: string;
+};
+
+export const PolicyEditTabs: React.FC = () => {
+  const { workspaceSlug, policyId } = useParams<{
+    workspaceSlug: string;
+    policyId: string;
+  }>();
+
+  const pathname = usePathname();
+
+  const policyEditUrls = urls
+    .workspace(workspaceSlug)
+    .policies()
+    .edit(policyId);
+
+  const tabs: TabConfig[] = [
+    {
+      id: "config",
+      label: "Policy Configuration",
+      description: "Basic policy configuration",
+      href: policyEditUrls.configuration(),
+    },
+    {
+      id: "time-windows",
+      label: "Time Windows",
+      description: "Schedule-based deployment rules",
+      href: policyEditUrls.timeWindows(),
+    },
+    {
+      id: "deployment-flow",
+      label: "Deployment Flow",
+      description: "Control deployment progression",
+      href: policyEditUrls.deploymentFlow(),
+    },
+    {
+      id: "quality-security",
+      label: "Quality & Security",
+      description: "Deployment safety measures",
+      href: policyEditUrls.qualitySecurity(),
+    },
+  ];
+
+  return (
+    <div className="flex h-full">
+      <div className="sticky top-0 h-full w-64 flex-shrink-0 border-r">
+        <div className="flex flex-col py-2">
+          {tabs.map((tab) => (
+            <Link
+              href={tab.href}
+              key={tab.id}
+              className={cn(
+                "flex w-full cursor-pointer justify-start gap-3 p-3 text-muted-foreground",
+
+                pathname === tab.href
+                  ? "bg-purple-500/10 text-purple-300"
+                  : "hover:bg-purple-500/5 hover:text-purple-300",
+              )}
+            >
+              <IconCircleFilled className="ml-4 mt-2 size-2" />
+              <div className="space-y-1">
+                <div>{tab.label}</div>
+                <div
+                  className={cn(
+                    "text-xs",
+                    pathname === tab.href
+                      ? "text-purple-300"
+                      : "text-muted-foreground",
+                  )}
+                >
+                  {tab.description}
+                </div>
+              </div>
+            </Link>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/configuration/EditConfiguration.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/configuration/EditConfiguration.tsx
new file mode 100644
index 000000000..85f7be25e
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/configuration/EditConfiguration.tsx
@@ -0,0 +1,454 @@
+"use client";
+
+import type * as SCHEMA from "@ctrlplane/db/schema";
+import type { DeploymentCondition } from "@ctrlplane/validators/deployments";
+import type { EnvironmentCondition } from "@ctrlplane/validators/environments";
+import { useRouter } from "next/navigation";
+import { IconPlus, IconTrash } from "@tabler/icons-react";
+import { z } from "zod";
+
+import { Button } from "@ctrlplane/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@ctrlplane/ui/dropdown-menu";
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useFieldArray,
+  useForm,
+} from "@ctrlplane/ui/form";
+import { Input } from "@ctrlplane/ui/input";
+import { Label } from "@ctrlplane/ui/label";
+import { Switch } from "@ctrlplane/ui/switch";
+import { Textarea } from "@ctrlplane/ui/textarea";
+import { deploymentCondition } from "@ctrlplane/validators/deployments";
+import { environmentCondition } from "@ctrlplane/validators/environments";
+
+import { DeploymentConditionRender } from "~/app/[workspaceSlug]/(app)/_components/deployments/condition/DeploymentConditionRender";
+import { EnvironmentConditionRender } from "~/app/[workspaceSlug]/(app)/_components/environment/condition/EnvironmentConditionRender";
+import { api } from "~/trpc/react";
+
+const editConfigSchema = z.object({
+  name: z.string(),
+  description: z.string().nullable(),
+  priority: z.number(),
+  enabled: z.boolean(),
+  targets: z.array(
+    z.object({
+      deploymentSelector: deploymentCondition.nullable(),
+      environmentSelector: environmentCondition.nullable(),
+    }),
+  ),
+});
+
+// Available options for environments and deployments
+const ENVIRONMENTS = ["production", "staging", "development"] as const;
+const DEPLOYMENTS = ["web-app", "api-service", "worker"] as const;
+
+const TARGET_SCOPE_OPTIONS = [
+  {
+    value: "deployment_specific",
+    label: "Specific Deployments",
+    description: "Apply policy to selected deployments across all environments",
+    isDeploymentSelectorNull: false,
+    isEnvironmentSelectorNull: true,
+  },
+  {
+    value: "environment_specific",
+    label: "Specific Environments",
+    description: "Apply policy to selected environments across all deployments",
+    isDeploymentSelectorNull: true,
+    isEnvironmentSelectorNull: false,
+  },
+  {
+    value: "deployment_environment_pair",
+    label: "Specific Deployment-Environment Pairs",
+    description:
+      "Apply policy when both deployment conditions and environment conditions match",
+    isDeploymentSelectorNull: false,
+    isEnvironmentSelectorNull: false,
+  },
+];
+
+export const EditConfiguration: React.FC<{
+  policy: SCHEMA.Policy & {
+    targets: Array<{
+      deploymentSelector: DeploymentCondition | null;
+      environmentSelector: EnvironmentCondition | null;
+    }>;
+  };
+}> = ({ policy }) => {
+  const form = useForm({
+    schema: editConfigSchema,
+    defaultValues: {
+      name: policy.name,
+      description: policy.description,
+      priority: policy.priority,
+      enabled: policy.enabled,
+      targets: policy.targets,
+    },
+  });
+
+  const updatePolicy = api.policy.update.useMutation();
+  const router = useRouter();
+
+  const { id } = policy;
+  const onSubmit = form.handleSubmit((data) =>
+    updatePolicy
+      .mutateAsync({ id, data })
+      .then((res) => form.reset(res))
+      .then(() => router.refresh()),
+  );
+
+  const { fields, append, remove, update } = useFieldArray({
+    control: form.control,
+    name: "targets",
+  });
+
+  return (
+    <Form {...form}>
+      <form onSubmit={onSubmit} className="space-y-8">
+        <div className="space-y-2">
+          <h2 className="text-lg font-semibold">Basic Policy Configuration</h2>
+          <p className="text-sm text-muted-foreground">
+            Configure the basic settings for your policy
+          </p>
+        </div>
+
+        <div className="space-y-6">
+          <div className="space-y-1">
+            <h3 className="text-md font-medium">General Settings</h3>
+            <p className="text-sm text-muted-foreground">
+              Configure the basic policy information
+            </p>
+          </div>
+
+          <div className="max-w-lg space-y-6">
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Policy Name</FormLabel>
+                  <FormControl>
+                    <Input placeholder="Enter policy name..." {...field} />
+                  </FormControl>
+                  <FormDescription>
+                    A unique name to identify this policy
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="description"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Description</FormLabel>
+                  <FormControl>
+                    <Textarea
+                      placeholder="Describe the purpose of this policy..."
+                      {...field}
+                      value={field.value ?? ""}
+                    />
+                  </FormControl>
+                  <FormDescription>
+                    Optional description to explain the policy's purpose
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="priority"
+              render={({ field }) => (
+                <FormItem className="flex-1">
+                  <div className="space-y-0.5">
+                    <FormLabel>Priority Level</FormLabel>
+                    <FormDescription>
+                      Higher numbers indicate higher priority. Can be any number
+                      including negative.
+                    </FormDescription>
+                  </div>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      {...field}
+                      className="w-24"
+                      onChange={(e) => {
+                        const value = parseInt(e.target.value);
+                        field.onChange(value);
+                      }}
+                    />
+                  </FormControl>
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="enabled"
+              render={({ field }) => (
+                <FormItem className="flex flex-row items-center justify-between gap-4">
+                  <FormControl className="flex-shrink-0">
+                    <Switch
+                      checked={field.value}
+                      onCheckedChange={field.onChange}
+                    />
+                  </FormControl>
+                  <div className="flex-grow space-y-0.5">
+                    <FormLabel>Enabled</FormLabel>
+                    <FormDescription>
+                      Toggle to enable/disable this policy
+                    </FormDescription>
+                  </div>
+                </FormItem>
+              )}
+            />
+          </div>
+        </div>
+
+        <div className="space-y-6">
+          <div className="space-y-1">
+            <h3 className="text-md font-medium">Policy Targets</h3>
+            <p className="text-sm text-muted-foreground">
+              Define which environments and deployments this policy applies to
+            </p>
+          </div>
+
+          <div className="max-w-[1200px] space-y-4">
+            {fields.map((field, index) => (
+              <div
+                key={field.id}
+                className="flex items-start gap-4 rounded-lg border p-4"
+              >
+                <div className="flex-1 space-y-4">
+                  {/* <FormField
+                      control={form.control}
+                      name={`targets.${index}.targetScope`}
+                      render={({ field }) => ( */}
+                  <div>
+                    <Label>Type</Label>
+                    <DropdownMenu>
+                      <DropdownMenuTrigger className="mt-1 flex w-[350px] items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2">
+                        {(() => {
+                          const target = fields[index];
+                          if (!target) return null;
+                          const option = TARGET_SCOPE_OPTIONS.find(
+                            (opt) =>
+                              opt.isDeploymentSelectorNull ===
+                                (target.deploymentSelector === null) &&
+                              opt.isEnvironmentSelectorNull ===
+                                (target.environmentSelector === null),
+                          );
+                          return (
+                            <span>
+                              {option?.label ?? "Select target scope..."}
+                            </span>
+                          );
+                        })()}
+                      </DropdownMenuTrigger>
+                      <DropdownMenuContent className="w-[350px]">
+                        {TARGET_SCOPE_OPTIONS.map((option) => (
+                          <DropdownMenuItem
+                            key={option.value}
+                            onClick={() =>
+                              update(index, {
+                                deploymentSelector:
+                                  option.isDeploymentSelectorNull
+                                    ? null
+                                    : {
+                                        type: "comparison",
+                                        not: false,
+                                        operator: "and",
+                                        conditions: [],
+                                      },
+                                environmentSelector:
+                                  option.isEnvironmentSelectorNull
+                                    ? null
+                                    : {
+                                        type: "comparison",
+                                        not: false,
+                                        operator: "and",
+                                        conditions: [],
+                                      },
+                              })
+                            }
+                            className="flex flex-col items-start"
+                          >
+                            <span>{option.label}</span>
+                            <span className="text-xs text-muted-foreground">
+                              {option.description}
+                            </span>
+                          </DropdownMenuItem>
+                        ))}
+                      </DropdownMenuContent>
+                    </DropdownMenu>
+                  </div>
+
+                  <FormField
+                    control={form.control}
+                    name={`targets.${index}.environmentSelector`}
+                    render={({ field: { value, onChange } }) =>
+                      value != null ? (
+                        <FormItem>
+                          <FormLabel>Environment</FormLabel>
+                          <div className="min-w-[1000px] text-sm">
+                            <EnvironmentConditionRender
+                              condition={value}
+                              onChange={onChange}
+                              depth={0}
+                              className="w-full"
+                            />
+                          </div>
+                          <FormMessage />
+                        </FormItem>
+                      ) : (
+                        <FormItem>
+                          <FormLabel>Environment</FormLabel>
+                          <div className="text-sm text-muted-foreground">
+                            Applies to all environments under those deployments.
+                          </div>
+                        </FormItem>
+                      )
+                    }
+                  />
+
+                  <FormField
+                    control={form.control}
+                    name={`targets.${index}.deploymentSelector`}
+                    render={({ field: { value, onChange } }) =>
+                      value != null ? (
+                        <FormItem>
+                          <FormLabel>Deployment</FormLabel>
+                          <div className="min-w-[1000px] text-sm">
+                            <DeploymentConditionRender
+                              condition={value}
+                              onChange={onChange}
+                              depth={0}
+                              className="w-full"
+                            />
+                          </div>
+                          <FormMessage />
+                        </FormItem>
+                      ) : (
+                        <></>
+                      )
+                    }
+                  />
+                </div>
+
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="icon"
+                  className="mt-8"
+                  onClick={() => remove(index)}
+                >
+                  <IconTrash className="h-4 w-4" />
+                </Button>
+              </div>
+            ))}
+
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              className="w-fit"
+              onClick={() =>
+                append({
+                  environmentSelector: {
+                    type: "comparison",
+                    not: false,
+                    operator: "and",
+                    conditions: [],
+                  },
+                  deploymentSelector: null,
+                })
+              }
+            >
+              <IconPlus className="mr-2 h-4 w-4" />
+              Add Target
+            </Button>
+          </div>
+
+          <div className="max-w-xl rounded-lg border p-4">
+            <h4 className="mb-4 font-medium">Target Coverage Preview</h4>
+            <div className="relative overflow-hidden">
+              <table className="w-full border-collapse text-sm">
+                <thead>
+                  <tr>
+                    <th className="border-b p-2 text-left font-medium">
+                      Environment
+                    </th>
+                    {DEPLOYMENTS.map((dep) => (
+                      <th
+                        key={dep}
+                        className="border-b p-2 text-left font-medium"
+                      >
+                        {dep
+                          .split("-")
+                          .map(
+                            (word) =>
+                              word.charAt(0).toUpperCase() + word.slice(1),
+                          )
+                          .join(" ")}
+                      </th>
+                    ))}
+                  </tr>
+                </thead>
+                <tbody>
+                  {ENVIRONMENTS.map((env) => (
+                    <tr key={env}>
+                      <td className="border-b p-2 font-medium">
+                        {env.charAt(0).toUpperCase() + env.slice(1)}
+                      </td>
+                      {DEPLOYMENTS.map((dep) => (
+                        <td key={`${env}-${dep}`} className="border-b p-2">
+                          {/* {getCoverage(env, dep) ? (
+                              <Badge
+                                variant="secondary"
+                                className="bg-purple-500/10 text-purple-300"
+                              >
+                                Included
+                              </Badge>
+                            ) : (
+                              <Badge
+                                variant="outline"
+                                className="text-muted-foreground"
+                              >
+                                Not Included
+                              </Badge>
+                            )} */}
+                        </td>
+                      ))}
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+
+        <Button
+          type="submit"
+          disabled={updatePolicy.isPending || !form.formState.isDirty}
+        >
+          Save
+        </Button>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/configuration/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/configuration/page.tsx
new file mode 100644
index 000000000..694fed4ce
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/configuration/page.tsx
@@ -0,0 +1,15 @@
+import { notFound } from "next/navigation";
+
+import { api } from "~/trpc/server";
+import { EditConfiguration } from "./EditConfiguration";
+
+export default async function ConfigurationPage(props: {
+  params: Promise<{ policyId: string }>;
+}) {
+  const { policyId } = await props.params;
+
+  const policy = await api.policy.byId({ policyId });
+  if (policy == null) return notFound();
+
+  return <EditConfiguration policy={policy} />;
+}
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/deployment-flow/EditDeploymentFlow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/deployment-flow/EditDeploymentFlow.tsx
new file mode 100644
index 000000000..5b718cb30
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/deployment-flow/EditDeploymentFlow.tsx
@@ -0,0 +1,308 @@
+"use client";
+
+import type * as SCHEMA from "@ctrlplane/db/schema";
+import { useState } from "react";
+import { useParams, useRouter } from "next/navigation";
+import { IconCheck, IconSelector } from "@tabler/icons-react";
+import { Label } from "recharts";
+import { z } from "zod";
+
+import { cn } from "@ctrlplane/ui";
+import { Button } from "@ctrlplane/ui/button";
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "@ctrlplane/ui/command";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useForm,
+} from "@ctrlplane/ui/form";
+import { Popover, PopoverContent, PopoverTrigger } from "@ctrlplane/ui/popover";
+import {
+  defaultCondition,
+  deploymentVersionCondition,
+} from "@ctrlplane/validators/releases";
+
+import { DeploymentVersionConditionRender } from "~/app/[workspaceSlug]/(app)/_components/deployments/version/condition/DeploymentVersionConditionRender";
+import { api } from "~/trpc/react";
+
+type HeaderProps = {
+  title: string;
+  description: string;
+};
+
+const Header: React.FC<HeaderProps> = ({ title, description }) => (
+  <div className="max-w-xl space-y-2">
+    <h2 className="text-lg font-semibold">{title}</h2>
+    <p className="text-sm text-muted-foreground">{description}</p>
+  </div>
+);
+
+type DeploymentComboboxProps = {
+  deployments: Array<{ id: string; system: { name: string }; name: string }>;
+  selectedId: string | null;
+  onSelect: (id: string | null) => void;
+};
+
+const DeploymentCombobox: React.FC<DeploymentComboboxProps> = ({
+  deployments,
+  selectedId,
+  onSelect,
+}) => (
+  <Popover>
+    <PopoverTrigger asChild>
+      <Button
+        variant="outline"
+        role="combobox"
+        className="w-[350px] justify-between"
+      >
+        {selectedId
+          ? deployments.find((d) => d.id === selectedId)
+            ? `${
+                deployments.find((d) => d.id === selectedId)?.system.name
+              } / ${deployments.find((d) => d.id === selectedId)?.name}`
+            : "Select deployment..."
+          : "Select deployment..."}
+        <IconSelector className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+      </Button>
+    </PopoverTrigger>
+    <PopoverContent className="w-[350px] p-0">
+      <Command>
+        <CommandInput placeholder="Search deployments..." />
+        <CommandList>
+          <CommandEmpty>No deployments found.</CommandEmpty>
+          <CommandGroup>
+            {deployments.map((deployment) => (
+              <CommandItem
+                key={deployment.id}
+                value={`${deployment.system.name}/${deployment.name}`}
+                onSelect={() => {
+                  onSelect(selectedId === deployment.id ? null : deployment.id);
+                }}
+              >
+                <IconCheck
+                  className={cn(
+                    "mr-2 h-4 w-4",
+                    selectedId === deployment.id ? "opacity-100" : "opacity-0",
+                  )}
+                />
+                <div className="flex flex-row items-center gap-1">
+                  <span>{deployment.system.name}</span>
+                  <span className="!text-muted-foreground">/</span>{" "}
+                  <span>{deployment.name}</span>
+                </div>
+              </CommandItem>
+            ))}
+          </CommandGroup>
+        </CommandList>
+      </Command>
+    </PopoverContent>
+  </Popover>
+);
+
+type VersionListProps = {
+  versions: Array<{ id: string; tag: string; createdAt: Date }>;
+  total?: number;
+};
+
+const VersionList: React.FC<VersionListProps> = ({ versions, total }) => (
+  <div className="space-y-2">
+    <div className="text-sm text-muted-foreground">
+      {versions.length === 0
+        ? "No matching versions found"
+        : `Found ${total} versions that match the conditions. Showing first ${versions.length} of them.`}
+    </div>
+    <div className="space-y-1">
+      {versions.map((version) => (
+        <div
+          key={version.id}
+          className="flex items-center justify-between rounded-md border px-3 py-2"
+        >
+          <div>
+            <div className="font-medium">{version.tag}</div>
+            <div className="text-sm text-muted-foreground">
+              Created {new Date(version.createdAt).toLocaleDateString()}
+            </div>
+          </div>
+        </div>
+      ))}
+    </div>
+  </div>
+);
+
+type VersionPreviewProps = {
+  deployments: Array<{ id: string; system: { name: string }; name: string }>;
+  selectedDeploymentId: string | null;
+  onDeploymentSelect: (id: string | null) => void;
+  versions: Array<{ id: string; tag: string; createdAt: Date }>;
+  totalVersions?: number;
+};
+
+const VersionPreview: React.FC<VersionPreviewProps> = ({
+  deployments,
+  selectedDeploymentId,
+  onDeploymentSelect,
+  versions,
+  totalVersions,
+}) => (
+  <div className="max-w-xl space-y-4 rounded-lg border p-4">
+    <div className="space-y-2">
+      <Label>Preview Matching Versions</Label>
+      <div>
+        <DeploymentCombobox
+          deployments={deployments}
+          selectedId={selectedDeploymentId}
+          onSelect={onDeploymentSelect}
+        />
+      </div>
+    </div>
+
+    {selectedDeploymentId && (
+      <VersionList versions={versions} total={totalVersions} />
+    )}
+  </div>
+);
+
+const editDeploymentFlowSchema = z.object({
+  deploymentVersionSelector: z
+    .object({
+      name: z.string(),
+      deploymentVersionSelector: deploymentVersionCondition,
+      description: z.string().nullable().optional(),
+    })
+    .nullable()
+    .optional(),
+});
+export const EditDeploymentFlow: React.FC<{
+  policy: SCHEMA.Policy & {
+    deploymentVersionSelector?: SCHEMA.PolicyDeploymentVersionSelector | null;
+  };
+}> = ({ policy }) => {
+  const { workspaceSlug } = useParams<{ workspaceSlug: string }>();
+  const router = useRouter();
+
+  const form = useForm({
+    schema: editDeploymentFlowSchema,
+    defaultValues: policy,
+  });
+
+  const updatePolicy = api.policy.update.useMutation();
+
+  const onSubmit = form.handleSubmit((data) =>
+    updatePolicy
+      .mutateAsync({
+        id: policy.id,
+        data: {
+          ...data,
+          deploymentVersionSelector: data.deploymentVersionSelector
+            ? { ...data.deploymentVersionSelector, name: "" }
+            : null,
+        },
+      })
+      .then((res) => form.reset(res))
+      .then(() => router.refresh()),
+  );
+
+  const [selectedDeploymentId, setSelectedDeploymentId] = useState<
+    string | null
+  >(null);
+
+  const workspaceQ = api.workspace.bySlug.useQuery(workspaceSlug);
+  const { data: workspace } = workspaceQ;
+
+  const deploymentsQ = api.deployment.byWorkspaceId.useQuery(
+    workspace?.id ?? "",
+    { enabled: workspace != null },
+  );
+  const deployments = deploymentsQ.data ?? [];
+
+  const { deploymentVersionSelector } =
+    form.watch("deploymentVersionSelector") ?? {};
+  const hasConditions =
+    (deploymentVersionSelector as any)?.conditions?.length > 0;
+
+  const versionsQ = api.deployment.version.list.useQuery(
+    {
+      deploymentId: selectedDeploymentId ?? "",
+      filter: (deploymentVersionSelector as any) ?? defaultCondition,
+      limit: 20,
+    },
+    { enabled: selectedDeploymentId !== null && hasConditions },
+  );
+  const versions = versionsQ.data?.items ?? [];
+
+  const errors = form.formState.errors;
+  console.log(errors);
+
+  return (
+    <Form {...form}>
+      <form onSubmit={onSubmit} className="space-y-8">
+        <Header
+          title="Deployment Flow Rules"
+          description="Configure how deployments progress through your environments"
+        />
+
+        <div className="space-y-6">
+          <Header
+            title="Version Selection Rules"
+            description="Control which versions can be deployed to environments"
+          />
+
+          <div className="space-y-6">
+            <FormField
+              control={form.control}
+              name="deploymentVersionSelector.deploymentVersionSelector"
+              render={({ field: { value, onChange } }) => (
+                <FormItem className="max-w-5xl space-y-2">
+                  <FormLabel>Version Selector</FormLabel>
+                  <FormControl>
+                    <DeploymentVersionConditionRender
+                      condition={(value as any) ?? defaultCondition}
+                      onChange={(newValue) => {
+                        onChange(newValue);
+                        form.setValue("deploymentVersionSelector.name", "");
+                        if (
+                          "conditions" in newValue &&
+                          !newValue.conditions.length
+                        ) {
+                          form.setValue("deploymentVersionSelector", null);
+                        }
+                      }}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            {hasConditions && (
+              <VersionPreview
+                deployments={deployments}
+                selectedDeploymentId={selectedDeploymentId}
+                onDeploymentSelect={setSelectedDeploymentId}
+                versions={versions}
+                totalVersions={versionsQ.data?.total}
+              />
+            )}
+          </div>
+        </div>
+
+        <Button
+          type="submit"
+          disabled={updatePolicy.isPending || !form.formState.isDirty}
+        >
+          Save
+        </Button>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/deployment-flow/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/deployment-flow/page.tsx
new file mode 100644
index 000000000..636a60422
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/deployment-flow/page.tsx
@@ -0,0 +1,13 @@
+import { notFound } from "next/navigation";
+
+import { api } from "~/trpc/server";
+import { EditDeploymentFlow } from "./EditDeploymentFlow";
+
+export default async function DeploymentFlowPage(props: {
+  params: Promise<{ policyId: string }>;
+}) {
+  const { policyId } = await props.params;
+  const policy = await api.policy.byId({ policyId });
+  if (policy == null) return notFound();
+  return <EditDeploymentFlow policy={policy} />;
+}
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/layout.tsx
new file mode 100644
index 000000000..d27d89bac
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/layout.tsx
@@ -0,0 +1,64 @@
+import React from "react";
+import Link from "next/link";
+import { notFound } from "next/navigation";
+import { IconArrowLeft } from "@tabler/icons-react";
+
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbPage,
+} from "@ctrlplane/ui/breadcrumb";
+
+import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader";
+import { urls } from "~/app/urls";
+import { api } from "~/trpc/server";
+import { PolicyEditTabs } from "./_components/PolicyEditTabs";
+
+export default async function Layout(props: {
+  children: React.ReactNode;
+  params: Promise<{
+    workspaceSlug: string;
+    policyId: string;
+  }>;
+}) {
+  const { params, children } = props;
+  const { workspaceSlug, policyId } = await params;
+
+  const policy = await api.policy.byId({ policyId });
+  if (policy == null) return notFound();
+  const policiesPage = urls.workspace(workspaceSlug).policies().baseUrl();
+
+  return (
+    <div className="flex h-full w-full flex-col">
+      <PageHeader>
+        <div className="flex shrink-0 items-center gap-4">
+          <Breadcrumb>
+            <BreadcrumbList>
+              <BreadcrumbItem>
+                <BreadcrumbLink asChild>
+                  <Link href={policiesPage}>
+                    <IconArrowLeft className="size-5" />
+                  </Link>
+                </BreadcrumbLink>
+              </BreadcrumbItem>
+              <BreadcrumbItem>
+                <BreadcrumbPage>Edit policy {policy.name}</BreadcrumbPage>
+              </BreadcrumbItem>
+            </BreadcrumbList>
+          </Breadcrumb>
+        </div>
+      </PageHeader>
+
+      <div className="flex flex-grow overflow-hidden">
+        <PolicyEditTabs />
+        <div className="w-full flex-grow">
+          <div className="scrollbar-thin scrollbar-thumb-neutral-700 scrollbar-track-neutral-800 h-full overflow-y-auto p-6">
+            {children}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/page.tsx
index 3bae14929..69d22839c 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/page.tsx
@@ -1,14 +1,4 @@
-import Link from "next/link";
-import { notFound } from "next/navigation";
-import { IconArrowLeft } from "@tabler/icons-react";
-
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbLink,
-  BreadcrumbList,
-  BreadcrumbPage,
-} from "@ctrlplane/ui/breadcrumb";
+import { notFound, redirect } from "next/navigation";
 
 import { urls } from "~/app/urls";
 import { api } from "~/trpc/server";
@@ -22,27 +12,10 @@ export default async function CreatePolicyPage({
   const workspace = await api.workspace.bySlug(workspaceSlug);
   if (workspace == null) return notFound();
 
-  const policy = await api.policy.byId(policyId);
+  const policy = await api.policy.byId({ policyId });
   if (policy == null) return notFound();
 
-  return (
-    <div className="flex h-full w-full flex-col overflow-hidden">
-      <div className="flex items-center border-b px-6 py-4">
-        <Breadcrumb>
-          <BreadcrumbList>
-            <BreadcrumbItem>
-              <BreadcrumbLink asChild>
-                <Link href={urls.workspace(workspaceSlug).policies().baseUrl()}>
-                  <IconArrowLeft className="mr-2 h-4 w-4" />
-                </Link>
-              </BreadcrumbLink>
-            </BreadcrumbItem>
-            <BreadcrumbItem>
-              <BreadcrumbPage>Update Policy</BreadcrumbPage>
-            </BreadcrumbItem>
-          </BreadcrumbList>
-        </Breadcrumb>
-      </div>
-    </div>
+  return redirect(
+    urls.workspace(workspaceSlug).policies().edit(policyId).configuration(),
   );
 }
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/quality-security/EditQualitySecurity.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/quality-security/EditQualitySecurity.tsx
new file mode 100644
index 000000000..4cc3869ed
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/quality-security/EditQualitySecurity.tsx
@@ -0,0 +1,452 @@
+"use client";
+
+import type * as SCHEMA from "@ctrlplane/db/schema";
+import type { Control } from "react-hook-form";
+import { useState } from "react";
+import { useRouter } from "next/navigation";
+import { IconPlus, IconTrash } from "@tabler/icons-react";
+import { useFieldArray } from "react-hook-form";
+import { z } from "zod";
+
+import { Avatar, AvatarFallback, AvatarImage } from "@ctrlplane/ui/avatar";
+import { Button } from "@ctrlplane/ui/button";
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "@ctrlplane/ui/command";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useForm,
+} from "@ctrlplane/ui/form";
+import { Input } from "@ctrlplane/ui/input";
+import { Popover, PopoverContent, PopoverTrigger } from "@ctrlplane/ui/popover";
+import { Switch } from "@ctrlplane/ui/switch";
+
+import { api } from "~/trpc/react";
+
+const UserInput: React.FC<{
+  workspaceId: string;
+  id: string;
+  setId: (id: string) => void;
+}> = ({ workspaceId, id, setId }) => {
+  const members = api.workspace.members.list.useQuery(workspaceId);
+  const [open, setOpen] = useState(false);
+
+  const selectedUser = members.data?.find((user) => user.user.id === id);
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button
+          variant="outline"
+          role="combobox"
+          aria-expanded={open}
+          className="w-[350px] justify-between"
+        >
+          {selectedUser?.user.name ?? "Select user..."}
+          <IconPlus className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className="w-[350px] p-0">
+        <Command>
+          <CommandInput placeholder="Search users..." />
+          <CommandList>
+            <CommandEmpty>No users found.</CommandEmpty>
+            <CommandGroup>
+              {members.data?.map((member) => (
+                <CommandItem
+                  key={member.user.id}
+                  value={member.user.id}
+                  onSelect={() => {
+                    setId(member.user.id);
+                    setOpen(false);
+                  }}
+                >
+                  <div className="flex items-center gap-2">
+                    <Avatar className="h-6 w-6">
+                      <AvatarImage src={member.user.image ?? undefined} />
+                      <AvatarFallback>
+                        {member.user.name?.[0] ?? "A"}
+                      </AvatarFallback>
+                    </Avatar>
+                    <div className="flex flex-col">
+                      <span>{member.user.name}</span>
+                      <span className="text-xs text-muted-foreground">
+                        {member.user.email}
+                      </span>
+                    </div>
+                  </div>
+                </CommandItem>
+              ))}
+            </CommandGroup>
+          </CommandList>
+        </Command>
+      </PopoverContent>
+    </Popover>
+  );
+};
+
+type EditQualitySecurityFormData = {
+  versionAnyApprovals: SCHEMA.PolicyRuleAnyApproval | null;
+  versionUserApprovals: SCHEMA.PolicyRuleUserApproval[];
+  versionRoleApprovals: SCHEMA.PolicyRuleRoleApproval[];
+};
+
+interface UserSectionProps {
+  control: Control<EditQualitySecurityFormData>;
+  fields: Record<"id", string>[];
+  onRemove: (index: number) => void;
+  workspaceId: string;
+}
+
+const UserSection: React.FC<UserSectionProps> = ({
+  control,
+  fields,
+  onRemove,
+  workspaceId,
+}) => {
+  if (fields.length === 0) return null;
+
+  return (
+    <div className="space-y-4">
+      <div className="space-y-1">
+        <h4 className="font-medium">Specific User Approvals</h4>
+        <p className="text-sm text-muted-foreground">
+          Approvals required from specific team members
+        </p>
+      </div>
+      {fields.map((field, index) => (
+        <div
+          key={field.id}
+          className="flex items-start gap-4 rounded-lg border p-4"
+        >
+          <div className="flex-1 space-y-4">
+            <FormField
+              control={control}
+              name={`versionUserApprovals.${index}.userId`}
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>User</FormLabel>
+                  <FormControl>
+                    <div className="w-full">
+                      <UserInput
+                        id={field.value}
+                        setId={field.onChange}
+                        workspaceId={workspaceId}
+                      />
+                    </div>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            className="mt-8"
+            onClick={() => onRemove(index)}
+          >
+            <IconTrash className="h-4 w-4" />
+          </Button>
+        </div>
+      ))}
+    </div>
+  );
+};
+
+interface RoleSectionProps {
+  control: Control<EditQualitySecurityFormData>;
+  fields: Record<"id", string>[];
+  onRemove: (index: number) => void;
+}
+
+const RoleSection: React.FC<RoleSectionProps> = ({
+  control,
+  fields,
+  onRemove,
+}) => {
+  if (fields.length === 0) return null;
+
+  return (
+    <div className="space-y-4">
+      <div className="space-y-1">
+        <h4 className="font-medium">Role-based Approvals</h4>
+        <p className="text-sm text-muted-foreground">
+          Approvals required from specific roles or groups
+        </p>
+      </div>
+      {fields.map((field, index) => (
+        <div
+          key={field.id}
+          className="flex items-start gap-4 rounded-lg border p-4"
+        >
+          <div className="flex-1 space-y-4">
+            <FormField
+              control={control}
+              name={`versionRoleApprovals.${index}.roleId`}
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Role Name</FormLabel>
+                  <FormControl>
+                    <Input placeholder="e.g., security-team" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={control}
+              name={`versionRoleApprovals.${index}.requiredApprovalsCount`}
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Required Approvals</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="number"
+                      min={1}
+                      placeholder="1"
+                      {...field}
+                      onChange={(e) => field.onChange(parseInt(e.target.value))}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            className="mt-8"
+            onClick={() => onRemove(index)}
+          >
+            <IconTrash className="h-4 w-4" />
+          </Button>
+        </div>
+      ))}
+    </div>
+  );
+};
+
+const editQualitySecuritySchema = z.object({
+  versionAnyApprovals: z
+    .object({
+      id: z.string(),
+      createdAt: z.date(),
+      requiredApprovalsCount: z.number(),
+      policyId: z.string(),
+    })
+    .nullable(),
+  versionUserApprovals: z.array(
+    z.object({
+      id: z.string(),
+      createdAt: z.date(),
+      policyId: z.string(),
+      userId: z.string(),
+    }),
+  ),
+  versionRoleApprovals: z.array(
+    z.object({
+      id: z.string(),
+      createdAt: z.date(),
+      policyId: z.string(),
+      roleId: z.string(),
+      requiredApprovalsCount: z.number(),
+    }),
+  ),
+});
+
+export const EditQualitySecurity: React.FC<{
+  policy: SCHEMA.Policy & {
+    versionAnyApprovals: SCHEMA.PolicyRuleAnyApproval | null;
+    versionUserApprovals: SCHEMA.PolicyRuleUserApproval[];
+    versionRoleApprovals: SCHEMA.PolicyRuleRoleApproval[];
+  };
+  workspaceId: string;
+}> = ({ policy, workspaceId }) => {
+  const form = useForm({
+    schema: editQualitySecuritySchema,
+    defaultValues: policy,
+  });
+  const router = useRouter();
+
+  const updatePolicy = api.policy.update.useMutation();
+
+  const onSubmit = form.handleSubmit((data) =>
+    updatePolicy
+      .mutateAsync({ id: policy.id, data })
+      .then((res) => form.reset(res))
+      .then(() => router.refresh()),
+  );
+
+  const {
+    fields: userFields,
+    append: appendUser,
+    remove: removeUser,
+  } = useFieldArray({
+    control: form.control,
+    name: "versionUserApprovals",
+  });
+
+  const { fields: roleFields, remove: removeRole } = useFieldArray({
+    control: form.control,
+    name: "versionRoleApprovals",
+  });
+
+  return (
+    <Form {...form}>
+      <form onSubmit={onSubmit} className="space-y-8">
+        <div className="space-y-2">
+          <h2 className="text-lg font-semibold">Quality & Security Rules</h2>
+          <p className="text-sm text-muted-foreground">
+            Configure approval requirements and security checks
+          </p>
+        </div>
+
+        <div className="max-w-xl space-y-8">
+          <div className="space-y-6">
+            <div className="flex items-center justify-between">
+              <div className="space-y-1">
+                <h3 className="text-md font-medium">Approval Requirements</h3>
+                <p className="text-sm text-muted-foreground">
+                  Define who needs to approve and how many approvals are needed
+                </p>
+              </div>
+            </div>
+
+            <div className="space-y-6">
+              <div className="space-y-4">
+                <div className="space-y-1">
+                  <h4 className="font-medium">General Approval</h4>
+                  <p className="text-sm text-muted-foreground">
+                    Enable if any team member can approve
+                  </p>
+                </div>
+                <div className="flex items-center gap-4 rounded-lg border p-4">
+                  <div className="flex-1 space-y-4">
+                    <FormField
+                      control={form.control}
+                      name="versionAnyApprovals"
+                      render={({ field }) => (
+                        <FormItem className="space-y-4">
+                          <div className="flex items-center justify-between">
+                            <div className="space-y-0.5">
+                              <FormLabel>Require General Approval</FormLabel>
+                            </div>
+                            <FormControl>
+                              <Switch
+                                checked={field.value !== null}
+                                onCheckedChange={(checked) =>
+                                  field.onChange(
+                                    checked
+                                      ? { requiredApprovalsCount: 1 }
+                                      : null,
+                                  )
+                                }
+                              />
+                            </FormControl>
+                          </div>
+                          {field.value !== null && (
+                            <FormField
+                              control={form.control}
+                              name="versionAnyApprovals.requiredApprovalsCount"
+                              render={({ field: countField }) => (
+                                <FormItem>
+                                  <FormLabel>Required Approvals</FormLabel>
+                                  <FormControl>
+                                    <Input
+                                      type="number"
+                                      min={1}
+                                      placeholder="1"
+                                      {...countField}
+                                      onChange={(e) =>
+                                        countField.onChange(
+                                          parseInt(e.target.value),
+                                        )
+                                      }
+                                    />
+                                  </FormControl>
+                                  <FormMessage />
+                                </FormItem>
+                              )}
+                            />
+                          )}
+                        </FormItem>
+                      )}
+                    />
+                  </div>
+                </div>
+              </div>
+
+              <UserSection
+                workspaceId={workspaceId}
+                control={form.control}
+                fields={userFields}
+                onRemove={removeUser}
+              />
+              <RoleSection
+                control={form.control}
+                fields={roleFields}
+                onRemove={removeRole}
+              />
+
+              <div className="flex gap-2">
+                <Button
+                  type="button"
+                  variant="outline"
+                  size="sm"
+                  className="flex-1"
+                  onClick={() =>
+                    appendUser({
+                      userId: "",
+                      policyId: policy.id,
+                      id: "",
+                      createdAt: new Date(),
+                    })
+                  }
+                >
+                  <IconPlus className="mr-2 h-4 w-4" />
+                  Add User Approval
+                </Button>
+                {/* <Button
+                  type="button"
+                  variant="outline"
+                  size="sm"
+                  className="flex-1"
+                  onClick={() =>
+                    appendRole({
+                      roleId: "",
+                      requiredApprovalsCount: 1,
+                    })
+                  }
+                >
+                  <IconPlus className="mr-2 h-4 w-4" />
+                  Add Role Approval
+                </Button> */}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <Button
+          type="submit"
+          disabled={updatePolicy.isPending || !form.formState.isDirty}
+        >
+          Save
+        </Button>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/quality-security/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/quality-security/page.tsx
new file mode 100644
index 000000000..2ca14da90
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/quality-security/page.tsx
@@ -0,0 +1,16 @@
+import { notFound } from "next/navigation";
+
+import { api } from "~/trpc/server";
+import { EditQualitySecurity } from "./EditQualitySecurity";
+
+export default async function QualitySecurityPage(props: {
+  params: Promise<{ workspaceSlug: string; policyId: string }>;
+}) {
+  const { workspaceSlug, policyId } = await props.params;
+  const [workspace, policy] = await Promise.all([
+    api.workspace.bySlug(workspaceSlug),
+    api.policy.byId({ policyId }),
+  ]);
+  if (workspace == null || policy == null) return notFound();
+  return <EditQualitySecurity policy={policy} workspaceId={workspace.id} />;
+}
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/time-windows/EditTimeWindow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/time-windows/EditTimeWindow.tsx
new file mode 100644
index 000000000..81930c03d
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/time-windows/EditTimeWindow.tsx
@@ -0,0 +1,264 @@
+"use client";
+
+import { useEffect } from "react";
+import { useRouter } from "next/navigation";
+import { IconPlus, IconX } from "@tabler/icons-react";
+import { startOfDay } from "date-fns";
+import * as rrule from "rrule";
+import { z } from "zod";
+
+import { createPolicyRuleDenyWindow } from "@ctrlplane/db/schema";
+import { Button } from "@ctrlplane/ui/button";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useFieldArray,
+  useForm,
+} from "@ctrlplane/ui/form";
+import { Input } from "@ctrlplane/ui/input";
+
+import { api } from "~/trpc/react";
+
+const editTimeWindowSchema = z.object({
+  denyWindows: z.array(createPolicyRuleDenyWindow.omit({ policyId: true })),
+});
+
+const getButtonVariant = (
+  value: rrule.ByWeekday | rrule.ByWeekday[] | null,
+  day: rrule.WeekdayStr,
+) => {
+  if (value == null) return "default";
+  if (Array.isArray(value)) return value.includes(day) ? "default" : "outline";
+  return value === day ? "default" : "outline";
+};
+
+const normalizeValue = (
+  value: rrule.ByWeekday | rrule.ByWeekday[] | null,
+): rrule.ByWeekday[] => {
+  if (value == null) return [];
+  if (Array.isArray(value)) return value;
+  return [value];
+};
+
+export const EditTimeWindow: React.FC<{
+  policyId: string;
+}> = ({ policyId }) => {
+  const now = new Date();
+  const { timeZone } = Intl.DateTimeFormat().resolvedOptions();
+  const router = useRouter();
+
+  const { data: policy } = api.policy.byId.useQuery({ policyId, timeZone });
+
+  const form = useForm({
+    schema: editTimeWindowSchema,
+    defaultValues: { denyWindows: policy?.denyWindows ?? [] },
+  });
+
+  useEffect(() => {
+    if (policy == null) return;
+    form.reset({ denyWindows: policy.denyWindows });
+  }, [policy, form]);
+
+  const updatePolicy = api.policy.update.useMutation();
+
+  const onSubmit = form.handleSubmit((data) =>
+    updatePolicy
+      .mutateAsync({ id: policyId, data })
+      .then((res) => form.reset(res))
+      .then(() => router.refresh()),
+  );
+
+  const { fields, append, remove } = useFieldArray({
+    control: form.control,
+    name: "denyWindows",
+  });
+
+  return (
+    <Form {...form}>
+      <form onSubmit={onSubmit} className="space-y-8">
+        <div className="space-y-2">
+          <h2 className="text-lg font-semibold">Time Window Rules</h2>
+          <p className="text-sm text-muted-foreground">
+            Configure when deployments should be blocked
+          </p>
+        </div>
+
+        <div className="space-y-8">
+          <div className="max-w-xl space-y-6">
+            <div className="flex items-center justify-between">
+              <div className="space-y-1">
+                <h3 className="text-md font-medium">Deny Windows</h3>
+                <p className="text-sm text-muted-foreground">
+                  Define the time periods when deployments should be blocked
+                </p>
+              </div>
+            </div>
+
+            <div className="space-y-4">
+              {fields.map((field, index) => (
+                <div
+                  key={field.id}
+                  className="flex items-start gap-4 rounded-lg border p-4"
+                >
+                  <div className="flex-1 space-y-4">
+                    <FormField
+                      control={form.control}
+                      name={`denyWindows.${index}.rrule.byweekday`}
+                      render={({ field: { value, onChange } }) => (
+                        <FormItem>
+                          <FormLabel>Days of Week</FormLabel>
+                          <div className="flex flex-wrap gap-2">
+                            {rrule.ALL_WEEKDAYS.map((day) => (
+                              <Button
+                                key={day}
+                                type="button"
+                                size="sm"
+                                variant={getButtonVariant(value, day)}
+                                className="capitalize"
+                                onClick={() => {
+                                  const currentValue = normalizeValue(value);
+                                  const newValue = currentValue.includes(day)
+                                    ? currentValue.filter((d) => d !== day)
+                                    : [...currentValue, day];
+                                  onChange(newValue);
+                                }}
+                              >
+                                {day}
+                              </Button>
+                            ))}
+                          </div>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+
+                    <div className="flex gap-4">
+                      <FormField
+                        control={form.control}
+                        name={`denyWindows.${index}.rrule.dtstart`}
+                        render={({ field: { value, onChange } }) => {
+                          const date = value != null ? new Date(value) : now;
+                          const hour = date
+                            .getHours()
+                            .toString()
+                            .padStart(2, "0");
+                          const minute = date
+                            .getMinutes()
+                            .toString()
+                            .padStart(2, "0");
+
+                          return (
+                            <FormItem className="flex-1">
+                              <FormLabel>Start Time</FormLabel>
+                              <FormControl>
+                                <Input
+                                  type="time"
+                                  value={`${hour}:${minute}`}
+                                  onChange={(e) => {
+                                    const [hour, minute] =
+                                      e.target.value.split(":");
+                                    if (hour == null || minute == null) return;
+                                    const newDate = new Date(date);
+                                    newDate.setHours(parseInt(hour));
+                                    newDate.setMinutes(parseInt(minute));
+                                    onChange(newDate);
+                                  }}
+                                />
+                              </FormControl>
+                              <FormMessage />
+                            </FormItem>
+                          );
+                        }}
+                      />
+
+                      <FormField
+                        control={form.control}
+                        name={`denyWindows.${index}.dtend`}
+                        render={({ field: { value, onChange } }) => {
+                          const date = value != null ? new Date(value) : now;
+                          const hour = date
+                            .getHours()
+                            .toString()
+                            .padStart(2, "0");
+                          const minute = date
+                            .getMinutes()
+                            .toString()
+                            .padStart(2, "0");
+
+                          return (
+                            <FormItem className="flex-1">
+                              <FormLabel>End Time</FormLabel>
+                              <FormControl>
+                                <Input
+                                  type="time"
+                                  value={`${hour}:${minute}`}
+                                  onChange={(e) => {
+                                    const [hour, minute] =
+                                      e.target.value.split(":");
+                                    if (hour == null || minute == null) return;
+                                    const newDate = new Date(date);
+                                    newDate.setHours(parseInt(hour));
+                                    newDate.setMinutes(parseInt(minute));
+                                    onChange(newDate);
+                                  }}
+                                />
+                              </FormControl>
+                              <FormMessage />
+                            </FormItem>
+                          );
+                        }}
+                      />
+                    </div>
+                  </div>
+
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="icon"
+                    className="h-6 w-6"
+                    onClick={() => remove(index)}
+                  >
+                    <IconX className="h-4 w-4" />
+                  </Button>
+                </div>
+              ))}
+
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                className="w-full"
+                onClick={() =>
+                  append({
+                    rrule: {
+                      byweekday: [] as rrule.ByWeekday[],
+                      freq: rrule.Frequency.WEEKLY,
+                      dtstart: startOfDay(now),
+                    } as rrule.Options,
+                    timeZone: timeZone,
+                    dtend: startOfDay(now),
+                  })
+                }
+              >
+                <IconPlus className="mr-2 h-4 w-4" />
+                Add Time Window
+              </Button>
+            </div>
+          </div>
+        </div>
+
+        <Button
+          type="submit"
+          disabled={updatePolicy.isPending || !form.formState.isDirty}
+          className="w-fit"
+        >
+          Save
+        </Button>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/time-windows/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/time-windows/page.tsx
new file mode 100644
index 000000000..63b8002b7
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/time-windows/page.tsx
@@ -0,0 +1,8 @@
+import { EditTimeWindow } from "./EditTimeWindow";
+
+export default async function TimeWindowsPage(props: {
+  params: Promise<{ policyId: string }>;
+}) {
+  const { policyId } = await props.params;
+  return <EditTimeWindow policyId={policyId} />;
+}
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/page.tsx
new file mode 100644
index 000000000..f4009c103
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/page.tsx
@@ -0,0 +1,12 @@
+import { redirect } from "next/navigation";
+
+import { urls } from "~/app/urls";
+
+export default async function PolicyPage(props: {
+  params: Promise<{ workspaceSlug: string; policyId: string }>;
+}) {
+  const { workspaceSlug, policyId } = await props.params;
+  return redirect(
+    urls.workspace(workspaceSlug).policies().edit(policyId).baseUrl(),
+  );
+}
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/create/_components/DeploymentFlow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/create/_components/DeploymentFlow.tsx
index 896823b24..94d491e91 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/policies/create/_components/DeploymentFlow.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/policies/create/_components/DeploymentFlow.tsx
@@ -178,9 +178,7 @@ export const DeploymentFlow: React.FC = () => {
 
   const deploymentsQ = api.deployment.byWorkspaceId.useQuery(
     workspace?.id ?? "",
-    {
-      enabled: workspace != null,
-    },
+    { enabled: workspace != null },
   );
   const deployments = deploymentsQ.data ?? [];
 
diff --git a/apps/webservice/src/app/urls.ts b/apps/webservice/src/app/urls.ts
index 21b10a032..062d2cf50 100644
--- a/apps/webservice/src/app/urls.ts
+++ b/apps/webservice/src/app/urls.ts
@@ -43,7 +43,18 @@ const workspacePolicies = (slug: string) => {
     denyWindows: () => buildUrl(...base, "deny-windows"),
     approvalGates: () => buildUrl(...base, "approval-gates"),
     versionConditions: () => buildUrl(...base, "version-conditions"),
-    edit: (policyId: string) => buildUrl(...base, policyId, "edit"),
+    edit: (policyId: string) => workspacePolicyEdit(slug, policyId),
+  };
+};
+
+const workspacePolicyEdit = (slug: string, policyId: string) => {
+  const base = [slug, "policies", policyId, "edit"];
+  return {
+    baseUrl: () => buildUrl(...base),
+    configuration: () => buildUrl(...base, "configuration"),
+    timeWindows: () => buildUrl(...base, "time-windows"),
+    deploymentFlow: () => buildUrl(...base, "deployment-flow"),
+    qualitySecurity: () => buildUrl(...base, "quality-security"),
   };
 };
 
diff --git a/packages/api/src/router/policy/create.ts b/packages/api/src/router/policy/create.ts
index 8a424c2cd..c2d7cf4a1 100644
--- a/packages/api/src/router/policy/create.ts
+++ b/packages/api/src/router/policy/create.ts
@@ -4,23 +4,10 @@ import type { z } from "zod";
 
 import { takeFirst } from "@ctrlplane/db";
 import * as SCHEMA from "@ctrlplane/db/schema";
-import { getDatePartsInTimeZone } from "@ctrlplane/rule-engine";
 
-type CreatePolicyInput = z.infer<typeof SCHEMA.createPolicy>;
+import { getLocalDateAsUTC } from "./time-util";
 
-const getLocalDateAsUTC = (date: Date, timeZone: string) => {
-  const parts = getDatePartsInTimeZone(date, timeZone);
-  return new Date(
-    Date.UTC(
-      parts.year,
-      parts.month,
-      parts.day,
-      parts.hour,
-      parts.minute,
-      parts.second,
-    ),
-  );
-};
+type CreatePolicyInput = z.infer<typeof SCHEMA.createPolicy>;
 
 const insertDenyWindows = async (
   tx: Tx,
@@ -42,12 +29,7 @@ const insertDenyWindows = async (
           : null;
 
       const rrule =
-        denyWindow.rrule != null
-          ? {
-              ...denyWindow.rrule,
-              dtstart,
-            }
-          : undefined;
+        denyWindow.rrule != null ? { ...denyWindow.rrule, dtstart } : undefined;
 
       return { ...denyWindow, rrule, dtend, policyId };
     }),
@@ -74,12 +56,9 @@ export const createPolicyInTx = async (tx: Tx, input: CreatePolicyInput) => {
   const { id: policyId } = policy;
 
   if (targets.length > 0)
-    await tx.insert(SCHEMA.policyTarget).values(
-      targets.map((target) => ({
-        ...target,
-        policyId,
-      })),
-    );
+    await tx
+      .insert(SCHEMA.policyTarget)
+      .values(targets.map((target) => ({ ...target, policyId })));
 
   await insertDenyWindows(tx, policyId, denyWindows);
 
@@ -97,20 +76,18 @@ export const createPolicyInTx = async (tx: Tx, input: CreatePolicyInput) => {
       .values({ ...versionAnyApprovals, policyId });
 
   if (versionUserApprovals.length > 0)
-    await tx.insert(SCHEMA.policyRuleUserApproval).values(
-      versionUserApprovals.map((approval) => ({
-        ...approval,
-        policyId,
-      })),
-    );
+    await tx
+      .insert(SCHEMA.policyRuleUserApproval)
+      .values(
+        versionUserApprovals.map((approval) => ({ ...approval, policyId })),
+      );
 
   if (versionRoleApprovals.length > 0)
-    await tx.insert(SCHEMA.policyRuleRoleApproval).values(
-      versionRoleApprovals.map((approval) => ({
-        ...approval,
-        policyId,
-      })),
-    );
+    await tx
+      .insert(SCHEMA.policyRuleRoleApproval)
+      .values(
+        versionRoleApprovals.map((approval) => ({ ...approval, policyId })),
+      );
 
   return policy;
 };
diff --git a/packages/api/src/router/policy/router.ts b/packages/api/src/router/policy/router.ts
index 257404db3..d2eb2fd39 100644
--- a/packages/api/src/router/policy/router.ts
+++ b/packages/api/src/router/policy/router.ts
@@ -19,6 +19,7 @@ import { Permission } from "@ctrlplane/validators/auth";
 
 import { createTRPCRouter, protectedProcedure } from "../../trpc";
 import { createPolicyInTx } from "./create";
+import { updatePolicyInTx } from "./update";
 
 export const policyRouter = createTRPCRouter({
   ai: createTRPCRouter({
@@ -175,13 +176,27 @@ export const policyRouter = createTRPCRouter({
   byId: protectedProcedure
     .meta({
       authorizationCheck: ({ canUser, input }) =>
-        canUser.perform(Permission.PolicyGet).on({ type: "policy", id: input }),
+        canUser
+          .perform(Permission.PolicyGet)
+          .on({ type: "policy", id: input.policyId }),
     })
-    .input(z.string().uuid())
-    .query(async ({ ctx, input }) =>
+    .input(
+      z.object({
+        policyId: z.string().uuid(),
+        timeZone: z.string().default("UTC"),
+      }),
+    )
+    .query(({ ctx, input }) =>
       ctx.db.query.policy.findFirst({
-        where: eq(policy.id, input),
-        with: { targets: true, denyWindows: true },
+        where: eq(policy.id, input.policyId),
+        with: {
+          targets: true,
+          denyWindows: true,
+          deploymentVersionSelector: true,
+          versionAnyApprovals: true,
+          versionUserApprovals: true,
+          versionRoleApprovals: true,
+        },
       }),
     ),
 
@@ -205,14 +220,9 @@ export const policyRouter = createTRPCRouter({
           .on({ type: "policy", id: input.id }),
     })
     .input(z.object({ id: z.string().uuid(), data: updatePolicy }))
-    .mutation(async ({ ctx, input }) => {
-      return ctx.db
-        .update(policy)
-        .set(input.data)
-        .where(eq(policy.id, input.id))
-        .returning()
-        .then(takeFirst);
-    }),
+    .mutation(({ ctx, input }) =>
+      ctx.db.transaction((tx) => updatePolicyInTx(tx, input.id, input.data)),
+    ),
 
   delete: protectedProcedure
     .meta({
diff --git a/packages/api/src/router/policy/time-util.ts b/packages/api/src/router/policy/time-util.ts
new file mode 100644
index 000000000..db4209698
--- /dev/null
+++ b/packages/api/src/router/policy/time-util.ts
@@ -0,0 +1,15 @@
+import { getDatePartsInTimeZone } from "@ctrlplane/rule-engine";
+
+export const getLocalDateAsUTC = (date: Date, timeZone: string) => {
+  const parts = getDatePartsInTimeZone(date, timeZone);
+  return new Date(
+    Date.UTC(
+      parts.year,
+      parts.month,
+      parts.day,
+      parts.hour,
+      parts.minute,
+      parts.second,
+    ),
+  );
+};
diff --git a/packages/api/src/router/policy/update.ts b/packages/api/src/router/policy/update.ts
new file mode 100644
index 000000000..341e25e76
--- /dev/null
+++ b/packages/api/src/router/policy/update.ts
@@ -0,0 +1,197 @@
+import type { Tx } from "@ctrlplane/db";
+import type { DeploymentVersionCondition } from "@ctrlplane/validators/releases";
+
+import { buildConflictUpdateColumns, eq, takeFirst } from "@ctrlplane/db";
+import * as SCHEMA from "@ctrlplane/db/schema";
+
+import { getLocalDateAsUTC } from "./time-util";
+
+const updateTargets = async (
+  tx: Tx,
+  policyId: string,
+  targets: SCHEMA.UpdatePolicy["targets"],
+) => {
+  if (targets == null) return;
+
+  await tx
+    .delete(SCHEMA.policyTarget)
+    .where(eq(SCHEMA.policyTarget.policyId, policyId));
+
+  if (targets.length === 0) return;
+
+  await tx
+    .insert(SCHEMA.policyTarget)
+    .values(targets.map((target) => ({ ...target, policyId })));
+};
+
+const updateDenyWindows = async (
+  tx: Tx,
+  policyId: string,
+  denyWindows: SCHEMA.UpdatePolicy["denyWindows"],
+) => {
+  if (denyWindows == null) return;
+
+  await tx
+    .delete(SCHEMA.policyRuleDenyWindow)
+    .where(eq(SCHEMA.policyRuleDenyWindow.policyId, policyId));
+  if (denyWindows.length === 0) return;
+
+  await tx.insert(SCHEMA.policyRuleDenyWindow).values(
+    denyWindows.map((denyWindow) => {
+      const dtstart =
+        denyWindow.rrule?.dtstart != null
+          ? getLocalDateAsUTC(denyWindow.rrule.dtstart, denyWindow.timeZone)
+          : null;
+
+      const dtend =
+        denyWindow.dtend != null
+          ? getLocalDateAsUTC(denyWindow.dtend, denyWindow.timeZone)
+          : null;
+
+      const rrule =
+        denyWindow.rrule != null ? { ...denyWindow.rrule, dtstart } : undefined;
+
+      return { ...denyWindow, rrule, dtend, policyId };
+    }),
+  );
+};
+
+const updateDeploymentVersionSelector = async (
+  tx: Tx,
+  policyId: string,
+  deploymentVersionSelector: SCHEMA.UpdatePolicy["deploymentVersionSelector"],
+) => {
+  if (deploymentVersionSelector === undefined) return;
+  if (deploymentVersionSelector === null)
+    return tx
+      .delete(SCHEMA.policyDeploymentVersionSelector)
+      .where(eq(SCHEMA.policyDeploymentVersionSelector.policyId, policyId));
+
+  await tx
+    .insert(SCHEMA.policyDeploymentVersionSelector)
+    .values({
+      ...deploymentVersionSelector,
+      policyId,
+      deploymentVersionSelector:
+        deploymentVersionSelector.deploymentVersionSelector as DeploymentVersionCondition,
+    })
+    .onConflictDoUpdate({
+      target: [SCHEMA.policyDeploymentVersionSelector.policyId],
+      set: buildConflictUpdateColumns(SCHEMA.policyDeploymentVersionSelector, [
+        "name",
+        "description",
+        "deploymentVersionSelector",
+      ]),
+    });
+};
+
+const updateVersionAnyApprovals = async (
+  tx: Tx,
+  policyId: string,
+  versionAnyApprovals: SCHEMA.UpdatePolicy["versionAnyApprovals"],
+) => {
+  if (versionAnyApprovals === undefined) return;
+  if (versionAnyApprovals === null)
+    return tx
+      .delete(SCHEMA.policyRuleAnyApproval)
+      .where(eq(SCHEMA.policyRuleAnyApproval.policyId, policyId));
+
+  await tx.update(SCHEMA.policyRuleAnyApproval).set({
+    ...versionAnyApprovals,
+    policyId,
+  });
+};
+
+const updateVersionUserApprovals = async (
+  tx: Tx,
+  policyId: string,
+  versionUserApprovals: SCHEMA.UpdatePolicy["versionUserApprovals"],
+) => {
+  if (versionUserApprovals == null) return;
+
+  await tx
+    .delete(SCHEMA.policyRuleUserApproval)
+    .where(eq(SCHEMA.policyRuleUserApproval.policyId, policyId));
+
+  if (versionUserApprovals.length === 0) return;
+
+  await tx
+    .insert(SCHEMA.policyRuleUserApproval)
+    .values(
+      versionUserApprovals.map((approval) => ({ ...approval, policyId })),
+    );
+};
+
+const updateVersionRoleApprovals = async (
+  tx: Tx,
+  policyId: string,
+  versionRoleApprovals: SCHEMA.UpdatePolicy["versionRoleApprovals"],
+) => {
+  if (versionRoleApprovals == null) return;
+
+  await tx
+    .delete(SCHEMA.policyRuleRoleApproval)
+    .where(eq(SCHEMA.policyRuleRoleApproval.policyId, policyId));
+
+  if (versionRoleApprovals.length === 0) return;
+
+  await tx
+    .insert(SCHEMA.policyRuleRoleApproval)
+    .values(
+      versionRoleApprovals.map((approval) => ({ ...approval, policyId })),
+    );
+};
+
+export const updatePolicyInTx = async (
+  tx: Tx,
+  id: string,
+  input: SCHEMA.UpdatePolicy,
+) => {
+  const {
+    targets,
+    denyWindows,
+    deploymentVersionSelector,
+    versionAnyApprovals,
+    versionUserApprovals,
+    versionRoleApprovals,
+    ...rest
+  } = input;
+
+  const policy = await tx
+    .select()
+    .from(SCHEMA.policy)
+    .where(eq(SCHEMA.policy.id, id))
+    .then(takeFirst);
+
+  if (Object.values(rest).length > 0)
+    await tx
+      .update(SCHEMA.policy)
+      .set(rest)
+      .where(eq(SCHEMA.policy.id, id))
+      .returning()
+      .then(takeFirst);
+
+  await Promise.all([
+    updateTargets(tx, policy.id, targets),
+    updateDenyWindows(tx, policy.id, denyWindows),
+    updateDeploymentVersionSelector(tx, policy.id, deploymentVersionSelector),
+    updateVersionAnyApprovals(tx, policy.id, versionAnyApprovals),
+    updateVersionUserApprovals(tx, policy.id, versionUserApprovals),
+    updateVersionRoleApprovals(tx, policy.id, versionRoleApprovals),
+  ]);
+
+  const updatedPolicy = await tx.query.policy.findFirst({
+    where: eq(SCHEMA.policy.id, id),
+    with: {
+      targets: true,
+      denyWindows: true,
+      deploymentVersionSelector: true,
+      versionAnyApprovals: true,
+      versionUserApprovals: true,
+      versionRoleApprovals: true,
+    },
+  });
+
+  if (updatedPolicy == null) throw new Error("Policy not found");
+  return updatedPolicy;
+};
diff --git a/packages/db/src/schema/policy.ts b/packages/db/src/schema/policy.ts
index 95522d108..eaba83bca 100644
--- a/packages/db/src/schema/policy.ts
+++ b/packages/db/src/schema/policy.ts
@@ -97,7 +97,28 @@ export const createPolicy = z.intersection(
 );
 export type CreatePolicy = z.infer<typeof createPolicy>;
 
-export const updatePolicy = policyInsertSchema.partial();
+export const updatePolicy = policyInsertSchema.partial().extend({
+  targets: z
+    .array(policyTargetInsertSchema.omit({ policyId: true }))
+    .optional(),
+  denyWindows: z
+    .array(createPolicyRuleDenyWindow.omit({ policyId: true }))
+    .optional(),
+  deploymentVersionSelector: createPolicyDeploymentVersionSelector
+    .omit({ policyId: true })
+    .optional()
+    .nullable(),
+  versionAnyApprovals: createPolicyRuleAnyApproval
+    .omit({ policyId: true })
+    .optional()
+    .nullable(),
+  versionUserApprovals: z
+    .array(createPolicyRuleUserApproval.omit({ policyId: true }))
+    .optional(),
+  versionRoleApprovals: z
+    .array(createPolicyRuleRoleApproval.omit({ policyId: true }))
+    .optional(),
+});
 export type UpdatePolicy = z.infer<typeof updatePolicy>;
 
 export const createPolicyTarget = policyTargetInsertSchema;