diff --git a/apps/webservice/src/app/[workspaceSlug]/(targets)/targets/[targetId]/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(targets)/targets/[targetId]/variables/page.tsx
index 6e1b2ab68..d6d2820ab 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(targets)/targets/[targetId]/variables/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(targets)/targets/[targetId]/variables/page.tsx
@@ -1,21 +1,5 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
 "use client";
 
-import { useState } from "react";
-import { IconDots } from "@tabler/icons-react";
-import { z } from "zod";
-
-import { Button } from "@ctrlplane/ui/button";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  useForm,
-} from "@ctrlplane/ui/form";
-import { Input } from "@ctrlplane/ui/input";
-import { Popover, PopoverContent, PopoverTrigger } from "@ctrlplane/ui/popover";
 import {
   Table,
   TableBody,
@@ -27,179 +11,23 @@ import {
 
 import { api } from "~/trpc/react";
 
-const ValueInput: React.FC<{
-  value: any;
-  onChange: (v: any) => void;
-  possibleValues: any[];
-}> = ({ possibleValues, value, onChange }) => {
-  const [open, setOpen] = useState(false);
-  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger
-        onClick={(e) => e.stopPropagation()}
-        className="flex flex-grow gap-2"
-      >
-        <Input
-          className="w-full"
-          value={value}
-          onChange={(e) => onChange(e.target.value)}
-          placeholder={value == null ? "NULL" : ""}
-        />
-      </PopoverTrigger>
-      <PopoverContent
-        align="start"
-        className="max-h-[300px] overflow-x-auto p-0 text-sm"
-        onOpenAutoFocus={(e) => e.preventDefault()}
-      >
-        {possibleValues.map((k) => (
-          <Button
-            variant="ghost"
-            size="sm"
-            key={k}
-            className="w-full rounded-none text-left"
-            onClick={(e) => {
-              e.preventDefault();
-              onChange(k?.toString());
-              setOpen(false);
-            }}
-          >
-            <div className="w-full">{JSON.stringify(k)}</div>
-          </Button>
-        ))}
-      </PopoverContent>
-    </Popover>
-  );
-};
-
 const VariableRow: React.FC<{
-  variableId: string;
   varKey: string;
   description: string;
-  targetId: string;
   value?: string | null;
-  possibleValues: any[];
-}> = ({ variableId, targetId, varKey, description, value, possibleValues }) => {
-  const [edit, setEdit] = useState(false);
-
-  const form = useForm({
-    schema: z.object({ key: z.string(), value: z.string() }),
-    defaultValues: { key: varKey, value },
-  });
-  console.log(value);
-  const set = api.deployment.variable.value.setTarget.useMutation();
-  const utils = api.useUtils();
-  const onSubmit = form.handleSubmit(async ({ value }) => {
-    await set.mutateAsync({ value, variableId, targetId });
-    await utils.deployment.variable.byTargetId.invalidate(targetId);
-    setEdit(false);
-  });
-
-  if (edit) {
-    return (
-      <TableRow className="border-x hover:bg-inherit">
-        <TableCell colSpan={4} className="bg-neutral-900/40 drop-shadow-xl">
-          <Form {...form}>
-            <form onSubmit={onSubmit} className="space-y-3 p-6">
-              <div className="flex items-end gap-3">
-                <FormField
-                  control={form.control}
-                  name="key"
-                  render={({ field }) => (
-                    <FormItem className="max-w-[300px] flex-grow">
-                      <FormLabel>Key</FormLabel>
-                      <FormControl>
-                        <Input
-                          className="w-full"
-                          disabled
-                          placeholder=""
-                          {...field}
-                        />
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name="value"
-                  render={({ field: { value, onChange } }) => (
-                    <FormItem className="flex-grow">
-                      <FormLabel>Value</FormLabel>
-                      <FormControl>
-                        <div className="flex w-full">
-                          <ValueInput
-                            onChange={onChange}
-                            value={value}
-                            possibleValues={possibleValues}
-                          />
-                        </div>
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-                <Button
-                  type="button"
-                  variant="destructive"
-                  disabled={set.isPending || value == null}
-                  onClick={async () => {
-                    await set.mutateAsync({
-                      value: null,
-                      variableId,
-                      targetId,
-                    });
-                    await utils.deployment.variable.byTargetId.invalidate(
-                      targetId,
-                    );
-                    setEdit(false);
-                  }}
-                >
-                  Clear
-                </Button>
-              </div>
-
-              <div className="flex items-center gap-2">
-                <Button
-                  variant="secondary"
-                  disabled={set.isPending}
-                  onClick={() => setEdit(false)}
-                >
-                  Cancel
-                </Button>
-
-                <Button type="submit" disabled={set.isPending}>
-                  Save
-                </Button>
-              </div>
-            </form>
-          </Form>
-        </TableCell>
-      </TableRow>
-    );
-  }
-
-  return (
-    <TableRow>
-      <TableCell className="w-[500px] p-3">
-        <div className="flex items-center gap-2">
-          <div>{varKey}</div>
-        </div>
-        <div className="text-sm text-muted-foreground">{description}</div>
-      </TableCell>
-      <TableCell className="p-3">
-        {value ?? <div className="italic text-neutral-500">NULL</div>}
-      </TableCell>
-      <TableCell className="w-10 p-3">
-        <Button
-          variant="outline"
-          size="icon"
-          className="rounded-full"
-          onClick={() => setEdit(true)}
-        >
-          <IconDots />
-        </Button>
-      </TableCell>
-    </TableRow>
-  );
-};
+}> = ({ varKey, description, value }) => (
+  <TableRow>
+    <TableCell className="w-[500px] p-3">
+      <div className="flex items-center gap-2">
+        <div>{varKey}</div>
+      </div>
+      <div className="text-sm text-muted-foreground">{description}</div>
+    </TableCell>
+    <TableCell className="p-3">
+      {value ?? <div className="italic text-neutral-500">NULL</div>}
+    </TableCell>
+  </TableRow>
+);
 
 export default function VariablePage({
   params,
@@ -231,12 +59,9 @@ export default function VariablePage({
                   .map((v) => (
                     <VariableRow
                       key={v.id}
-                      variableId={v.id}
-                      targetId={params.targetId}
                       varKey={v.key}
                       value={v.value.value}
                       description={v.description}
-                      possibleValues={v.possibleValues}
                     />
                   ))}
               </TableBody>
diff --git a/apps/webservice/src/app/[workspaceSlug]/_components/target-drawer/VariablesContent.tsx b/apps/webservice/src/app/[workspaceSlug]/_components/target-drawer/VariablesContent.tsx
index ad2df739f..0a645ed15 100644
--- a/apps/webservice/src/app/[workspaceSlug]/_components/target-drawer/VariablesContent.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/_components/target-drawer/VariablesContent.tsx
@@ -1,21 +1,5 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
 "use client";
 
-import { useState } from "react";
-import { IconDots } from "@tabler/icons-react";
-import { z } from "zod";
-
-import { Button } from "@ctrlplane/ui/button";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  useForm,
-} from "@ctrlplane/ui/form";
-import { Input } from "@ctrlplane/ui/input";
-import { Popover, PopoverContent, PopoverTrigger } from "@ctrlplane/ui/popover";
 import {
   Table,
   TableBody,
@@ -27,179 +11,23 @@ import {
 
 import { api } from "~/trpc/react";
 
-const ValueInput: React.FC<{
-  value: any;
-  onChange: (v: any) => void;
-  possibleValues: any[];
-}> = ({ possibleValues, value, onChange }) => {
-  const [open, setOpen] = useState(false);
-  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger
-        onClick={(e) => e.stopPropagation()}
-        className="flex flex-grow gap-2"
-      >
-        <Input
-          className="w-full"
-          value={value}
-          onChange={(e) => onChange(e.target.value)}
-          placeholder={value == null ? "NULL" : ""}
-        />
-      </PopoverTrigger>
-      <PopoverContent
-        align="start"
-        className="max-h-[300px] overflow-x-auto p-0 text-sm"
-        onOpenAutoFocus={(e) => e.preventDefault()}
-      >
-        {possibleValues.map((k) => (
-          <Button
-            variant="ghost"
-            size="sm"
-            key={k}
-            className="w-full rounded-none text-left"
-            onClick={(e) => {
-              e.preventDefault();
-              onChange(k?.toString());
-              setOpen(false);
-            }}
-          >
-            <div className="w-full">{JSON.stringify(k)}</div>
-          </Button>
-        ))}
-      </PopoverContent>
-    </Popover>
-  );
-};
-
 const VariableRow: React.FC<{
-  variableId: string;
   varKey: string;
   description: string;
-  targetId: string;
   value?: string | null;
-  possibleValues: any[];
-}> = ({ variableId, targetId, varKey, description, value, possibleValues }) => {
-  const [edit, setEdit] = useState(false);
-
-  const form = useForm({
-    schema: z.object({ key: z.string(), value: z.string() }),
-    defaultValues: { key: varKey, value },
-  });
-  console.log(value);
-  const set = api.deployment.variable.value.setTarget.useMutation();
-  const utils = api.useUtils();
-  const onSubmit = form.handleSubmit(async ({ value }) => {
-    await set.mutateAsync({ value, variableId, targetId });
-    await utils.deployment.variable.byTargetId.invalidate(targetId);
-    setEdit(false);
-  });
-
-  if (edit) {
-    return (
-      <TableRow className="border-x hover:bg-inherit">
-        <TableCell colSpan={4} className="bg-neutral-900/40 drop-shadow-xl">
-          <Form {...form}>
-            <form onSubmit={onSubmit} className="space-y-3 p-6">
-              <div className="flex items-end gap-3">
-                <FormField
-                  control={form.control}
-                  name="key"
-                  render={({ field }) => (
-                    <FormItem className="max-w-[300px] flex-grow">
-                      <FormLabel>Key</FormLabel>
-                      <FormControl>
-                        <Input
-                          className="w-full"
-                          disabled
-                          placeholder=""
-                          {...field}
-                        />
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name="value"
-                  render={({ field: { value, onChange } }) => (
-                    <FormItem className="flex-grow">
-                      <FormLabel>Value</FormLabel>
-                      <FormControl>
-                        <div className="flex w-full">
-                          <ValueInput
-                            onChange={onChange}
-                            value={value}
-                            possibleValues={possibleValues}
-                          />
-                        </div>
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-                <Button
-                  type="button"
-                  variant="destructive"
-                  disabled={set.isPending || value == null}
-                  onClick={async () => {
-                    await set.mutateAsync({
-                      value: null,
-                      variableId,
-                      targetId,
-                    });
-                    await utils.deployment.variable.byTargetId.invalidate(
-                      targetId,
-                    );
-                    setEdit(false);
-                  }}
-                >
-                  Clear
-                </Button>
-              </div>
-
-              <div className="flex items-center gap-2">
-                <Button
-                  variant="secondary"
-                  disabled={set.isPending}
-                  onClick={() => setEdit(false)}
-                >
-                  Cancel
-                </Button>
-
-                <Button type="submit" disabled={set.isPending}>
-                  Save
-                </Button>
-              </div>
-            </form>
-          </Form>
-        </TableCell>
-      </TableRow>
-    );
-  }
-
-  return (
-    <TableRow>
-      <TableCell className="w-[500px] p-3">
-        <div className="flex items-center gap-2">
-          <div>{varKey}</div>
-        </div>
-        <div className="text-sm text-muted-foreground">{description}</div>
-      </TableCell>
-      <TableCell className="p-3">
-        {value ?? <div className="italic text-neutral-500">NULL</div>}
-      </TableCell>
-      <TableCell className="w-10 p-3">
-        <Button
-          variant="outline"
-          size="icon"
-          className="rounded-full"
-          onClick={() => setEdit(true)}
-        >
-          <IconDots className="h-4 w-4" />
-        </Button>
-      </TableCell>
-    </TableRow>
-  );
-};
+}> = ({ varKey, description, value }) => (
+  <TableRow>
+    <TableCell className="w-[500px] p-3">
+      <div className="flex items-center gap-2">
+        <div>{varKey}</div>
+      </div>
+      <div className="text-sm text-muted-foreground">{description}</div>
+    </TableCell>
+    <TableCell className="p-3">
+      {value ?? <div className="italic text-neutral-500">NULL</div>}
+    </TableCell>
+  </TableRow>
+);
 
 export const VariableContent: React.FC<{ targetId: string }> = ({
   targetId,
@@ -218,7 +46,6 @@ export const VariableContent: React.FC<{ targetId: string }> = ({
                 <TableRow className="text-sm">
                   <TableHead className="p-3">Keys</TableHead>
                   <TableHead className="p-3">Value</TableHead>
-                  <TableHead />
                 </TableRow>
               </TableHeader>
               <TableBody>
@@ -227,12 +54,9 @@ export const VariableContent: React.FC<{ targetId: string }> = ({
                   .map((v) => (
                     <VariableRow
                       key={v.id}
-                      variableId={v.id}
-                      targetId={targetId}
                       varKey={v.key}
                       value={v.value.value}
                       description={v.description}
-                      possibleValues={v.possibleValues}
                     />
                   ))}
               </TableBody>
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/create/ConfigFields.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/ConfigFields.tsx
similarity index 74%
rename from apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/create/ConfigFields.tsx
rename to apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/ConfigFields.tsx
index 55ffcdbcc..8a1aa7233 100644
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/create/ConfigFields.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/ConfigFields.tsx
@@ -3,6 +3,7 @@
 import type {
   BooleanVariableConfigType,
   ChoiceVariableConfigType,
+  NumberVariableConfigType,
   StringVariableConfigType,
   VariableConfigType,
 } from "@ctrlplane/validators/variables";
@@ -10,7 +11,6 @@ import { IconX } from "@tabler/icons-react";
 import _ from "lodash";
 
 import { Button } from "@ctrlplane/ui/button";
-import { Checkbox } from "@ctrlplane/ui/checkbox";
 import { FormControl, FormItem, FormLabel } from "@ctrlplane/ui/form";
 import { Input } from "@ctrlplane/ui/input";
 import {
@@ -25,26 +25,23 @@ import { Textarea } from "@ctrlplane/ui/textarea";
 export const ConfigTypeSelector: React.FC<{
   value: string | undefined;
   onChange: (type: string) => void;
-}> = ({ value, onChange }) => {
-  return (
-    <Select value={value} onValueChange={onChange}>
-      <SelectTrigger>
-        <SelectValue placeholder="Select type" />
-      </SelectTrigger>
-      <SelectContent>
-        <SelectItem value="string">String</SelectItem>
-        <SelectItem value="number">Number</SelectItem>
-        <SelectItem value="boolean">Boolean</SelectItem>
-        <SelectItem value="choice">Choice</SelectItem>
-      </SelectContent>
-    </Select>
-  );
-};
+}> = ({ value, onChange }) => (
+  <Select value={value} onValueChange={onChange}>
+    <SelectTrigger>
+      <SelectValue placeholder="Select type" />
+    </SelectTrigger>
+    <SelectContent>
+      <SelectItem value="string">String</SelectItem>
+      <SelectItem value="number">Number</SelectItem>
+      <SelectItem value="boolean">Boolean</SelectItem>
+      <SelectItem value="choice">Choice</SelectItem>
+    </SelectContent>
+  </Select>
+);
 
 type ConfigFieldsFC<T extends VariableConfigType> = React.FC<{
   config: T;
   updateConfig: (updates: Partial<T>) => void;
-  setConfig: (value: T) => void;
 }>;
 
 export const StringConfigFields: ConfigFieldsFC<StringVariableConfigType> = ({
@@ -71,7 +68,7 @@ export const StringConfigFields: ConfigFieldsFC<StringVariableConfigType> = ({
     </FormItem>
 
     <FormItem>
-      <FormLabel>Value</FormLabel>
+      <FormLabel>Default Value</FormLabel>
       <FormControl>
         <>
           {config.inputType === "text" && (
@@ -79,14 +76,22 @@ export const StringConfigFields: ConfigFieldsFC<StringVariableConfigType> = ({
               type="text"
               placeholder="Enter text"
               value={config.default ?? ""}
-              onChange={(e) => updateConfig({ default: e.target.value })}
+              onChange={(e) =>
+                updateConfig({
+                  default: e.target.value !== "" ? e.target.value : undefined,
+                })
+              }
             />
           )}
           {config.inputType === "text-area" && (
             <Textarea
               placeholder="Enter text"
               value={config.default ?? ""}
-              onChange={(e) => updateConfig({ default: e.target.value })}
+              onChange={(e) =>
+                updateConfig({
+                  default: e.target.value !== "" ? e.target.value : undefined,
+                })
+              }
             />
           )}
         </>
@@ -103,18 +108,39 @@ export const BooleanConfigFields: ConfigFieldsFC<BooleanVariableConfigType> = ({
     <FormLabel>Default Value</FormLabel>
     <FormControl>
       <div className="flex items-center gap-2">
-        <Checkbox
-          checked={config.default}
-          className="inline"
-          onCheckedChange={(e) => updateConfig({ default: Boolean(e) })}
-        />
-
-        {String(config.default ?? "false")}
+        <Select
+          value={String(config.default ?? "")}
+          onValueChange={(value) => updateConfig({ default: value === "true" })}
+        >
+          <SelectTrigger>
+            <SelectValue placeholder="Select default value" />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="true">True</SelectItem>
+            <SelectItem value="false">False</SelectItem>
+          </SelectContent>
+        </Select>
       </div>
     </FormControl>
   </FormItem>
 );
 
+export const NumberConfigFields: ConfigFieldsFC<NumberVariableConfigType> = ({
+  config,
+  updateConfig,
+}) => (
+  <FormItem>
+    <FormLabel>Default Value</FormLabel>
+    <FormControl>
+      <Input
+        type="number"
+        value={config.default ?? 0}
+        onChange={(e) => updateConfig({ default: e.target.valueAsNumber })}
+      />
+    </FormControl>
+  </FormItem>
+);
+
 export const ChoiceConfigFields: ConfigFieldsFC<ChoiceVariableConfigType> = ({
   config,
   updateConfig,
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/VariableInputs.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/VariableInputs.tsx
new file mode 100644
index 000000000..e2a768185
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/VariableInputs.tsx
@@ -0,0 +1,87 @@
+import type {
+  ChoiceVariableConfigType,
+  StringVariableConfigType,
+} from "@ctrlplane/validators/variables";
+
+import { Input } from "@ctrlplane/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@ctrlplane/ui/select";
+import { Textarea } from "@ctrlplane/ui/textarea";
+
+export const VariableStringInput: React.FC<
+  StringVariableConfigType & {
+    value: string;
+    onChange: (v: string) => void;
+  }
+> = ({
+  value,
+  onChange,
+  inputType,
+  minLength,
+  maxLength,
+  default: defaultValue,
+}) => (
+  <div>
+    {inputType === "text" && (
+      <Input
+        type="text"
+        value={value}
+        placeholder={defaultValue}
+        onChange={(e) => onChange(e.target.value)}
+        minLength={minLength}
+        maxLength={maxLength}
+      />
+    )}
+    {inputType === "text-area" && (
+      <Textarea
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        minLength={minLength}
+        maxLength={maxLength}
+      />
+    )}
+  </div>
+);
+
+export const VariableChoiceSelect: React.FC<
+  ChoiceVariableConfigType & {
+    value: string;
+    onSelect: (v: string) => void;
+  }
+> = ({ value, onSelect, options }) => (
+  <Select value={value} onValueChange={onSelect}>
+    <SelectTrigger>
+      <SelectValue />
+    </SelectTrigger>
+    <SelectContent>
+      {options.map((o) => (
+        <SelectItem key={o} value={o}>
+          {o}
+        </SelectItem>
+      ))}
+    </SelectContent>
+  </Select>
+);
+
+export const VariableBooleanInput: React.FC<{
+  value: boolean | null;
+  onChange: (v: boolean) => void;
+}> = ({ value, onChange }) => (
+  <Select
+    value={value ? value.toString() : undefined}
+    onValueChange={(v) => onChange(v === "true")}
+  >
+    <SelectTrigger>
+      <SelectValue />
+    </SelectTrigger>
+    <SelectContent>
+      <SelectItem value="true">True</SelectItem>
+      <SelectItem value="false">False</SelectItem>
+    </SelectContent>
+  </Select>
+);
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/AddVariableValueDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/AddVariableValueDialog.tsx
deleted file mode 100644
index 3d45044bd..000000000
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/AddVariableValueDialog.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import type { DeploymentVariable } from "@ctrlplane/db/schema";
-import { useState } from "react";
-import { z } from "zod";
-
-import { Button } from "@ctrlplane/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@ctrlplane/ui/dialog";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-  useForm,
-} from "@ctrlplane/ui/form";
-import { Input } from "@ctrlplane/ui/input";
-
-import { api } from "~/trpc/react";
-
-const schema = z.object({ value: z.string() });
-
-export const AddVariableValueDialog: React.FC<{
-  variable: DeploymentVariable;
-  children?: React.ReactNode;
-}> = ({ children, variable }) => {
-  const [open, setOpen] = useState(false);
-
-  const create = api.deployment.variable.value.create.useMutation();
-  const utils = api.useUtils();
-  const form = useForm({ schema, defaultValues: { value: "" } });
-  const onSubmit = form.handleSubmit(async (values) => {
-    await create.mutateAsync({ ...values, variableId: variable.id });
-    await utils.deployment.variable.byDeploymentId.invalidate();
-    setOpen(false);
-  });
-
-  return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger asChild>{children}</DialogTrigger>
-      <DialogContent>
-        <Form {...form}>
-          <form onSubmit={onSubmit} className="space-y-3">
-            <DialogHeader>
-              <DialogTitle>Add Value</DialogTitle>
-              <DialogDescription>value are things</DialogDescription>
-            </DialogHeader>
-
-            <FormField
-              control={form.control}
-              name="value"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Value</FormLabel>
-                  <FormControl>
-                    <Input placeholder="" {...field} />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <DialogFooter>
-              <Button type="submit" disabled={create.isPending}>
-                Add
-              </Button>
-            </DialogFooter>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-};
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/CreateVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/CreateVariableDialog.tsx
index b05fb0e99..af3470368 100644
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/CreateVariableDialog.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/CreateVariableDialog.tsx
@@ -1,8 +1,12 @@
 "use client";
 
 import { useState } from "react";
+import { useRouter } from "next/navigation";
+import { IconBulb } from "@tabler/icons-react";
+import _ from "lodash";
 import { z } from "zod";
 
+import { Alert, AlertTitle } from "@ctrlplane/ui/alert";
 import { Button } from "@ctrlplane/ui/button";
 import {
   Dialog,
@@ -24,22 +28,46 @@ import {
 } from "@ctrlplane/ui/form";
 import { Input } from "@ctrlplane/ui/input";
 import { Textarea } from "@ctrlplane/ui/textarea";
+import { VariableConfig } from "@ctrlplane/validators/variables";
 
+import {
+  BooleanConfigFields,
+  ChoiceConfigFields,
+  ConfigTypeSelector,
+  NumberConfigFields,
+  StringConfigFields,
+} from "~/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/ConfigFields";
 import { api } from "~/trpc/react";
 
-const schema = z.object({ key: z.string(), description: z.string() });
+const schema = z.object({
+  key: z.string(),
+  description: z.string(),
+  config: VariableConfig,
+});
 
-export const CreateVaribaleDialog: React.FC<{
+export const CreateVariableDialog: React.FC<{
   deploymentId: string;
   children?: React.ReactNode;
 }> = ({ children, deploymentId }) => {
   const [open, setOpen] = useState(false);
   const create = api.deployment.variable.create.useMutation();
-  const utils = api.useUtils();
-  const form = useForm({ schema, defaultValues: { description: "" } });
+  const router = useRouter();
+  const form = useForm({
+    schema,
+    defaultValues: {
+      description: "",
+      config: { type: "string", inputType: "text" },
+    },
+  });
+
+  const { config } = form.watch();
+
   const onSubmit = form.handleSubmit(async (values) => {
-    await create.mutateAsync({ ...values, deploymentId });
-    await utils.deployment.variable.byDeploymentId.invalidate();
+    await create.mutateAsync({
+      ...values,
+      deploymentId,
+    });
+    router.refresh();
     setOpen(false);
   });
   return (
@@ -50,7 +78,17 @@ export const CreateVaribaleDialog: React.FC<{
           <form onSubmit={onSubmit} className="space-y-3">
             <DialogHeader>
               <DialogTitle>Add Variable</DialogTitle>
-              <DialogDescription>Variables are things</DialogDescription>
+              <DialogDescription>
+                <Alert variant="secondary">
+                  <IconBulb className="h-5 w-5" />
+                  <AlertTitle>Deployment variables</AlertTitle>
+                  Variables in deployments make automation flexible and
+                  reusable. They let you customize deployments with user inputs
+                  and use environment-specific values without hardcoding. This
+                  allows deployments to adapt to different scenarios without
+                  changing their core logic.
+                </Alert>
+              </DialogDescription>
             </DialogHeader>
 
             <FormField
@@ -70,6 +108,68 @@ export const CreateVaribaleDialog: React.FC<{
               )}
             />
 
+            <FormField
+              control={form.control}
+              name="config"
+              render={({ field: { value, onChange } }) => (
+                <>
+                  <FormItem>
+                    <FormLabel>Input Display</FormLabel>
+                    <FormControl>
+                      <ConfigTypeSelector
+                        value={value.type}
+                        onChange={(type: string) => {
+                          if (type === "choice") {
+                            onChange({ type, options: [] });
+                            return;
+                          }
+                          onChange({ type });
+                        }}
+                      />
+                    </FormControl>
+                  </FormItem>
+
+                  {value.type === "string" && (
+                    <StringConfigFields
+                      config={value}
+                      updateConfig={(updates) =>
+                        onChange({ ...value, ...updates })
+                      }
+                    />
+                  )}
+
+                  {value.type === "boolean" && (
+                    <BooleanConfigFields
+                      config={value}
+                      updateConfig={(updates) =>
+                        onChange({ ...value, ...updates })
+                      }
+                    />
+                  )}
+
+                  {value.type === "number" && (
+                    <NumberConfigFields
+                      config={value}
+                      updateConfig={(updates) =>
+                        onChange({ ...value, ...updates })
+                      }
+                    />
+                  )}
+
+                  {value.type === "choice" && (
+                    <ChoiceConfigFields
+                      config={value}
+                      updateConfig={(updates) =>
+                        onChange({ ...value, ...updates })
+                      }
+                    />
+                  )}
+                </>
+              )}
+            />
+
+            <pre className="text-xs">{JSON.stringify(config, null, 2)}</pre>
+
             <FormField
               control={form.control}
               name="description"
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/DeploymentNavBar.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/DeploymentNavBar.tsx
index db924cff0..f3c133342 100644
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/DeploymentNavBar.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/DeploymentNavBar.tsx
@@ -15,7 +15,7 @@ import {
 
 import { DeploymentOptionsDropdown } from "~/app/[workspaceSlug]/_components/DeploymentOptionsDropdown";
 import { api } from "~/trpc/react";
-import { CreateVaribaleDialog } from "./CreateVariableDialog";
+import { CreateVariableDialog } from "./CreateVariableDialog";
 
 export const DeploymentsNavBar: React.FC = () => {
   const pathname = usePathname();
@@ -59,15 +59,15 @@ export const DeploymentsNavBar: React.FC = () => {
         </div>
       </div>
       {pathname.startsWith(`${baseUrl}/variables`) && (
-        <CreateVaribaleDialog deploymentId={deployment.data?.id ?? ""}>
+        <CreateVariableDialog deploymentId={deployment.data?.id ?? ""}>
           <Button
             variant="secondary"
             className="flex shrink-0 items-center gap-2"
           >
             <IconPlus className="h-4 w-4" />
-            Add Varibale
+            Add Variable
           </Button>
-        </CreateVaribaleDialog>
+        </CreateVariableDialog>
       )}
     </div>
   );
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/AddVariableValueDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/AddVariableValueDialog.tsx
new file mode 100644
index 000000000..41ad1a441
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/AddVariableValueDialog.tsx
@@ -0,0 +1,158 @@
+import type { DeploymentVariable } from "@ctrlplane/db/schema";
+import { useState } from "react";
+import { useRouter } from "next/navigation";
+import { IconInfoCircle } from "@tabler/icons-react";
+import { z } from "zod";
+
+import { Button } from "@ctrlplane/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@ctrlplane/ui/dialog";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useForm,
+} from "@ctrlplane/ui/form";
+import { Input } from "@ctrlplane/ui/input";
+import { Switch } from "@ctrlplane/ui/switch";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@ctrlplane/ui/tooltip";
+
+import {
+  VariableBooleanInput,
+  VariableChoiceSelect,
+  VariableStringInput,
+} from "~/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/VariableInputs";
+import { api } from "~/trpc/react";
+
+const schema = z.object({
+  value: z.union([z.string(), z.number(), z.boolean()]),
+  default: z.boolean(),
+});
+
+export const AddVariableValueDialog: React.FC<{
+  variable: DeploymentVariable;
+  children?: React.ReactNode;
+}> = ({ children, variable }) => {
+  const [open, setOpen] = useState(false);
+
+  const create = api.deployment.variable.value.create.useMutation();
+  const router = useRouter();
+  const form = useForm({
+    schema,
+    defaultValues: { value: "", default: false },
+  });
+  const onSubmit = form.handleSubmit(async (values) => {
+    await create.mutateAsync({ ...values, variableId: variable.id });
+    router.refresh();
+    setOpen(false);
+  });
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>{children}</DialogTrigger>
+      <DialogContent>
+        <Form {...form}>
+          <form onSubmit={onSubmit} className="space-y-3">
+            <DialogHeader>
+              <DialogTitle>Add Value</DialogTitle>
+              <DialogDescription>value are things</DialogDescription>
+            </DialogHeader>
+
+            <div className="space-y-5">
+              <FormField
+                control={form.control}
+                name="value"
+                render={({ field: { value, onChange } }) => (
+                  <FormItem>
+                    <FormLabel>Value</FormLabel>
+                    <FormControl>
+                      <>
+                        {variable.config?.type === "string" && (
+                          <VariableStringInput
+                            {...variable.config}
+                            value={String(value)}
+                            onChange={onChange}
+                          />
+                        )}
+                        {variable.config?.type === "choice" && (
+                          <VariableChoiceSelect
+                            {...variable.config}
+                            value={String(value)}
+                            onSelect={onChange}
+                          />
+                        )}
+                        {variable.config?.type === "boolean" && (
+                          <VariableBooleanInput
+                            value={value === "" ? null : Boolean(value)}
+                            onChange={onChange}
+                          />
+                        )}
+                        {variable.config?.type === "number" && (
+                          <Input
+                            type="number"
+                            value={Number(value)}
+                            onChange={(e) => onChange(e.target.valueAsNumber)}
+                          />
+                        )}
+                      </>
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="default"
+                render={({ field: { value, onChange } }) => (
+                  <FormItem>
+                    <FormControl>
+                      <div className="flex items-center gap-4">
+                        <FormLabel className="flex items-center gap-1">
+                          Default
+                          <TooltipProvider>
+                            <Tooltip>
+                              <TooltipTrigger asChild>
+                                <IconInfoCircle className="h-4 w-4 text-muted-foreground" />
+                              </TooltipTrigger>
+                              <TooltipContent className="text-muted-foreground">
+                                A default value will match all targets in the
+                                system that are not matched by other values.
+                              </TooltipContent>
+                            </Tooltip>
+                          </TooltipProvider>
+                        </FormLabel>
+                        <Switch checked={value} onCheckedChange={onChange} />
+                      </div>
+                    </FormControl>
+                  </FormItem>
+                )}
+              />
+            </div>
+
+            <DialogFooter>
+              <Button type="submit" disabled={create.isPending}>
+                Add
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableDropdown.tsx
new file mode 100644
index 000000000..d62c23f40
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableDropdown.tsx
@@ -0,0 +1,98 @@
+import type { DeploymentVariable } from "@ctrlplane/db/schema";
+import React from "react";
+import { useRouter } from "next/navigation";
+import { IconPlus, IconTrash } from "@tabler/icons-react";
+
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@ctrlplane/ui/alert-dialog";
+import { buttonVariants } from "@ctrlplane/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@ctrlplane/ui/dropdown-menu";
+
+import { api } from "~/trpc/react";
+import { AddVariableValueDialog } from "./AddVariableValueDialog";
+
+const DeleteVariableDialog: React.FC<{
+  variableId: string;
+  children: React.ReactNode;
+}> = ({ variableId, children }) => {
+  const deleteVariable = api.deployment.variable.delete.useMutation();
+  const router = useRouter();
+
+  return (
+    <AlertDialog>
+      <AlertDialogTrigger asChild>{children}</AlertDialogTrigger>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>
+            Are you sure you want to delete this variable?
+          </AlertDialogTitle>
+          <AlertDialogDescription>
+            This will delete the variable and all of its values.
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter className="flex justify-end">
+          <AlertDialogCancel>Cancel</AlertDialogCancel>
+          <div className="flex-grow" />
+          <AlertDialogAction
+            className={buttonVariants({ variant: "destructive" })}
+            onClick={() =>
+              deleteVariable
+                .mutateAsync(variableId)
+                .then(() => router.refresh())
+            }
+          >
+            Delete
+          </AlertDialogAction>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+};
+
+export const VariableDropdown: React.FC<{
+  variable: DeploymentVariable;
+  children: React.ReactNode;
+}> = ({ variable, children }) => {
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>{children}</DropdownMenuTrigger>
+      <DropdownMenuContent>
+        <DropdownMenuGroup>
+          <AddVariableValueDialog variable={variable}>
+            <DropdownMenuItem
+              className="flex items-center gap-2"
+              onSelect={(e) => e.preventDefault()}
+            >
+              <IconPlus className="h-4 w-4" />
+              Add Value
+            </DropdownMenuItem>
+          </AddVariableValueDialog>
+          <DeleteVariableDialog variableId={variable.id}>
+            <DropdownMenuItem
+              className="flex items-center gap-2"
+              onSelect={(e) => e.preventDefault()}
+            >
+              <IconTrash className="h-4 w-4 text-red-500" />
+              Delete
+            </DropdownMenuItem>
+          </DeleteVariableDialog>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableTable.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableTable.tsx
index 1928efe9b..da9859f64 100644
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableTable.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableTable.tsx
@@ -1,20 +1,24 @@
 "use client";
 
-import type {
-  DeploymentVariable,
-  DeploymentVariableValue,
-} from "@ctrlplane/db/schema";
-import { Fragment } from "react";
-import { useRouter } from "next/navigation";
-import { IconDotsVertical, IconPlus } from "@tabler/icons-react";
+import { useState } from "react";
+import Link from "next/link";
+import { useParams } from "next/navigation";
+import { SiKubernetes, SiTerraform } from "@icons-pack/react-simple-icons";
+import {
+  IconChevronRight,
+  IconDotsVertical,
+  IconServer,
+  IconTarget,
+} from "@tabler/icons-react";
 
+import { cn } from "@ctrlplane/ui";
+import { Badge } from "@ctrlplane/ui/badge";
 import { Button } from "@ctrlplane/ui/button";
 import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@ctrlplane/ui/dropdown-menu";
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "@ctrlplane/ui/collapsible";
 import { Input } from "@ctrlplane/ui/input";
 import {
   Table,
@@ -25,17 +29,24 @@ import {
   TableRow,
 } from "@ctrlplane/ui/table";
 
-import { api } from "~/trpc/react";
+import type { VariableData } from "./variable-data";
 import { useMatchSorterWithSearch } from "~/utils/useMatchSorter";
-import { AddVariableValueDialog } from "../AddVariableValueDialog";
+import { VariableDropdown } from "./VariableDropdown";
+import { VariableValueDropdown } from "./VariableValueDropdown";
 
-type VariableData = DeploymentVariable & { values: DeploymentVariableValue[] };
+const TargetIcon: React.FC<{ version: string }> = ({ version }) => {
+  if (version.includes("kubernetes"))
+    return <SiKubernetes className="h-6 w-6 shrink-0 text-blue-300" />;
+  if (version.includes("vm") || version.includes("compute"))
+    return <IconServer className="h-6 w-6 shrink-0 text-cyan-300" />;
+  if (version.includes("terraform"))
+    return <SiTerraform className="h-6 w-6 shrink-0 text-purple-300" />;
+  return <IconTarget className="h-6 w-6 shrink-0 text-neutral-300" />;
+};
 
 export const VariableTable: React.FC<{
   variables: VariableData[];
 }> = ({ variables }) => {
-  const del = api.deployment.variable.value.delete.useMutation();
-  const router = useRouter();
   const { result, search, setSearch } = useMatchSorterWithSearch(variables, {
     keys: [
       "key",
@@ -43,6 +54,33 @@ export const VariableTable: React.FC<{
       (i) => i.values.map((v) => JSON.stringify(v.value)),
     ],
   });
+
+  const { workspaceSlug } = useParams<{ workspaceSlug: string }>();
+
+  const [expandedVariables, setExpandedVariables] = useState<
+    Record<string, boolean>
+  >({});
+
+  const [expandedValues, setExpandedValues] = useState<Record<string, boolean>>(
+    {},
+  );
+
+  const switchVariableExpandedState = (variableId: string) =>
+    setExpandedVariables((prev) => {
+      const newState = { ...prev };
+      const currentVariableState = newState[variableId] ?? false;
+      newState[variableId] = !currentVariableState;
+      return newState;
+    });
+
+  const switchValueExpandedState = (valueId: string) =>
+    setExpandedValues((prev) => {
+      const newState = { ...prev };
+      const currentValueState = newState[valueId] ?? false;
+      newState[valueId] = !currentValueState;
+      return newState;
+    });
+
   return (
     <>
       <div className="sticky left-0 right-0 top-0 z-20 border-b bg-neutral-950">
@@ -54,98 +92,246 @@ export const VariableTable: React.FC<{
           onChange={(e) => setSearch(e.target.value)}
         />
       </div>
-      <Table>
-        <TableHeader>
-          <TableRow>
-            <TableHead>Key</TableHead>
-            <TableHead>Value</TableHead>
-            <TableHead>Scope</TableHead>
-            <TableHead />
-          </TableRow>
-        </TableHeader>
+      <div className="scrollbar-thin scrollbar-thumb-neutral-800 scrollbar-track-neutral-900 h-[calc(100vh-138px)] overflow-auto">
+        <Table className="table-fixed">
+          <TableHeader>
+            <TableRow>
+              <TableHead>Key</TableHead>
+              <TableHead>Scope</TableHead>
+              <TableHead />
+            </TableRow>
+          </TableHeader>
 
-        <TableBody>
-          {result.map((variable) => {
-            return (
-              <Fragment key={variable.id}>
-                <TableRow>
-                  <TableCell rowSpan={variable.values.length + 1}>
-                    <div className="flex items-center gap-1">
-                      {variable.key}
-                      <AddVariableValueDialog variable={variable}>
-                        <Button
-                          variant="ghost"
-                          size="icon"
-                          className="h-6 w-6 rounded-full text-muted-foreground"
-                        >
-                          <IconPlus className="h-4 w-4" />
-                        </Button>
-                      </AddVariableValueDialog>
-                    </div>
-                    <div className="text-muted-foreground">
-                      {variable.description}
-                    </div>
-                  </TableCell>
-                </TableRow>
-                {variable.values.map((v, idx) => (
-                  <TableRow
-                    key={v.id ?? idx}
-                    className={
-                      idx !== variable.values.length - 1
-                        ? "border-b-neutral-900"
-                        : ""
-                    }
-                  >
+          <TableBody>
+            {result.map((variable) => (
+              <Collapsible key={variable.id} asChild>
+                <>
+                  <TableRow className="h-10 border-none">
                     <TableCell>
-                      <pre>{JSON.stringify(v.value)}</pre>
+                      <div className="flex items-center gap-1 pl-5">
+                        <CollapsibleTrigger asChild>
+                          <Button
+                            variant="ghost"
+                            size="icon"
+                            className="h-6 w-6"
+                            onClick={() =>
+                              switchVariableExpandedState(variable.id)
+                            }
+                          >
+                            <IconChevronRight
+                              className={cn(
+                                "h4 w-4 transition-all",
+                                expandedVariables[variable.id] && "rotate-90",
+                              )}
+                            />
+                          </Button>
+                        </CollapsibleTrigger>{" "}
+                        {variable.key}
+                      </div>
                     </TableCell>
-                    <TableCell className="space-x-2">
-                      {/* {v.deployments.map((d) => (
-                        <div
-                          key={d.id}
-                          className="inline-flex items-center gap-1 rounded-full bg-blue-500/10 px-2.5 py-0.5 text-blue-400 hover:bg-blue-500/15"
-                        >
-                          <IconShip /> {d.name}
-                        </div>
-                      ))}
-                      {v.systems.map((d) => (
-                        <div
-                          key={d.id}
-                          className="inline-flex items-center gap-1 rounded-full bg-green-500/10 px-2.5 py-0.5 text-green-400 hover:bg-green-500/15"
-                        >
-                          <IconCategory /> {d.name}
-                        </div>
-                      ))} */}
+                    <TableCell>
+                      <Badge
+                        variant="secondary"
+                        className="flex w-24 justify-center hover:bg-secondary"
+                      >
+                        {variable.values.length} value
+                        {variable.values.length === 1 ? "" : "s"}
+                      </Badge>
                     </TableCell>
-                    <TableCell className="w-10">
-                      {v.id != null && (
-                        <DropdownMenu>
-                          <DropdownMenuTrigger asChild>
-                            <Button variant="ghost" size="icon">
-                              <IconDotsVertical className="h-4 w-4" />
-                            </Button>
-                          </DropdownMenuTrigger>
-                          <DropdownMenuContent>
-                            <DropdownMenuItem
-                              onClick={async () => {
-                                if (v.id == null) return;
-                                await del.mutateAsync(v.id);
-                                router.refresh();
-                              }}
-                            >
-                              <span>Delete</span>
-                            </DropdownMenuItem>
-                          </DropdownMenuContent>
-                        </DropdownMenu>
-                      )}
+                    <TableCell>
+                      <div className="flex w-full justify-end">
+                        <VariableDropdown variable={variable}>
+                          <Button
+                            variant="ghost"
+                            size="icon"
+                            className="h-6 w-6"
+                          >
+                            <IconDotsVertical className="h-4 w-4" />
+                          </Button>
+                        </VariableDropdown>
+                      </div>
                     </TableCell>
                   </TableRow>
-                ))}
-              </Fragment>
-            );
-          })}
-        </TableBody>
-      </Table>
+                  <CollapsibleContent asChild>
+                    <>
+                      {variable.values.map((v, idx) => (
+                        <Collapsible key={v.id} asChild>
+                          <>
+                            <TableRow
+                              key={v.id}
+                              className="h-10 border-none py-0"
+                            >
+                              <TableCell
+                                className={cn(
+                                  "h-10 py-0",
+                                  idx === 0 && "pl-10",
+                                  idx !== 0 && "pl-[72px]",
+                                )}
+                              >
+                                {idx !== 0 && (
+                                  <div className="flex h-full items-center gap-1 border-l border-neutral-800 pl-7">
+                                    <CollapsibleTrigger asChild>
+                                      <Button
+                                        variant="ghost"
+                                        size="icon"
+                                        className="h-6 w-6"
+                                        onClick={() =>
+                                          switchValueExpandedState(v.id)
+                                        }
+                                      >
+                                        <IconChevronRight
+                                          className={cn(
+                                            "h4 w-4 transition-all",
+                                            expandedValues[v.id] && "rotate-90",
+                                          )}
+                                        />
+                                      </Button>
+                                    </CollapsibleTrigger>
+                                    {String(v.value)}
+                                    {variable.defaultValueId === v.id && (
+                                      <Badge className="hover:bg-primary">
+                                        default
+                                      </Badge>
+                                    )}
+                                  </div>
+                                )}
+                                {idx === 0 && (
+                                  <div className="flex h-full items-center">
+                                    <div className="flex h-full flex-col justify-start">
+                                      <div className="h-5 border-l border-neutral-800" />
+                                    </div>
+                                    <div className="h-[1px] w-[31px] flex-shrink-0 bg-neutral-800" />
+                                    <div className="flex h-full items-center gap-1 border-l border-neutral-800 py-2 pl-7">
+                                      <CollapsibleTrigger asChild>
+                                        <Button
+                                          variant="ghost"
+                                          size="icon"
+                                          className="h-6 w-6"
+                                          onClick={() =>
+                                            switchValueExpandedState(v.id)
+                                          }
+                                        >
+                                          <IconChevronRight
+                                            className={cn(
+                                              "h4 w-4 transition-all",
+                                              expandedValues[v.id] &&
+                                                "rotate-90",
+                                            )}
+                                          />
+                                        </Button>
+                                      </CollapsibleTrigger>
+                                      {String(v.value)}
+                                      {variable.defaultValueId === v.id && (
+                                        <Badge className="ml-2 hover:bg-primary">
+                                          default
+                                        </Badge>
+                                      )}
+                                    </div>
+                                  </div>
+                                )}
+                              </TableCell>
+                              <TableCell className="py-[6px]">
+                                <Badge
+                                  variant="secondary"
+                                  className="flex w-24 justify-center hover:bg-secondary"
+                                >
+                                  {v.targetCount} target
+                                  {v.targetCount === 1 ? "" : "s"}
+                                </Badge>
+                              </TableCell>
+                              <TableCell>
+                                <div className="flex justify-end">
+                                  <VariableValueDropdown value={v}>
+                                    <Button
+                                      variant="ghost"
+                                      size="icon"
+                                      className="h-6 w-6"
+                                      onClick={(e) => e.preventDefault()}
+                                    >
+                                      <IconDotsVertical className="h-4 w-4" />
+                                    </Button>
+                                  </VariableValueDropdown>
+                                </div>
+                              </TableCell>
+                            </TableRow>
+                            <CollapsibleContent asChild className="py-0">
+                              <>
+                                {v.targets.map((t, tIdx) => (
+                                  <TableRow key={t.id} className="border-none">
+                                    {tIdx !== 0 && (
+                                      <TableCell className="h-10 py-0 pl-[72px]">
+                                        <div className="flex h-full items-center border-l border-neutral-800 pl-[72px]">
+                                          <div className="flex h-full items-center gap-2 border-l border-neutral-800 pl-7">
+                                            <TargetIcon version={t.version} />
+                                            <div className="flex flex-col">
+                                              <span className="overflow-hidden text-nowrap text-sm">
+                                                {t.name}
+                                              </span>
+                                              <span className="text-xs text-muted-foreground">
+                                                {t.version}
+                                              </span>
+                                            </div>
+                                          </div>
+                                        </div>
+                                      </TableCell>
+                                    )}
+
+                                    {tIdx === 0 && (
+                                      <TableCell className="h-10 py-0 pl-[72px]">
+                                        <div className="flex h-full items-center border-l border-neutral-800 pl-10">
+                                          <div className="flex h-full items-center">
+                                            <div className="flex h-full flex-col justify-start">
+                                              <div className="h-5 border-l border-neutral-800" />
+                                            </div>
+                                            <div className="h-[1px] w-[31px] flex-shrink-0 bg-neutral-800" />
+                                            <div className="flex h-full items-center gap-2 border-l border-neutral-800 pl-7">
+                                              <TargetIcon version={t.version} />
+                                              <div className="flex flex-col">
+                                                <span className="overflow-hidden text-nowrap text-sm">
+                                                  {t.name}
+                                                </span>
+                                                <span className="text-xs text-muted-foreground">
+                                                  {t.version}
+                                                </span>
+                                              </div>
+                                            </div>
+                                          </div>
+                                        </div>
+                                      </TableCell>
+                                    )}
+                                    <TableCell />
+                                    <TableCell />
+                                  </TableRow>
+                                ))}
+                                <TableRow className="border-none">
+                                  <TableCell className="h-10 cursor-pointer py-0 pl-[72px]">
+                                    <div className="flex h-full items-center border-l border-neutral-800 pl-[72px]">
+                                      <Link
+                                        className="flex h-full items-center gap-2 border-l border-neutral-800 pl-7"
+                                        href={`/${workspaceSlug}/targets?filter=${v.filterHash}`}
+                                        target="_blank"
+                                      >
+                                        <IconDotsVertical className="h-4 w-4" />{" "}
+                                        View {v.targetCount} targets...
+                                      </Link>
+                                    </div>
+                                  </TableCell>
+                                  <TableCell />
+                                  <TableCell />
+                                </TableRow>
+                              </>
+                            </CollapsibleContent>
+                          </>
+                        </Collapsible>
+                      ))}
+                    </>
+                  </CollapsibleContent>
+                </>
+              </Collapsible>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
     </>
   );
 };
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableValueDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableValueDropdown.tsx
new file mode 100644
index 000000000..0e289df86
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/VariableValueDropdown.tsx
@@ -0,0 +1,120 @@
+import { useState } from "react";
+import { useRouter } from "next/navigation";
+import { IconTarget, IconTrash } from "@tabler/icons-react";
+
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@ctrlplane/ui/alert-dialog";
+import { buttonVariants } from "@ctrlplane/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@ctrlplane/ui/dropdown-menu";
+
+import type { VariableValue } from "./variable-data";
+import { TargetConditionDialog } from "~/app/[workspaceSlug]/_components/target-condition/TargetConditionDialog";
+import { api } from "~/trpc/react";
+
+const DeleteVariableValueDialog: React.FC<{
+  valueId: string;
+  children: React.ReactNode;
+  onClose: () => void;
+}> = ({ valueId, children, onClose }) => {
+  const [open, setOpen] = useState(false);
+  const deleteVariableValue =
+    api.deployment.variable.value.delete.useMutation();
+  const router = useRouter();
+
+  return (
+    <AlertDialog
+      open={open}
+      onOpenChange={(open) => {
+        setOpen(open);
+        if (!open) onClose();
+      }}
+    >
+      <AlertDialogTrigger asChild>{children}</AlertDialogTrigger>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>
+            Are you sure you want to delete this variable value?
+          </AlertDialogTitle>
+        </AlertDialogHeader>
+        <AlertDialogFooter className="flex justify-end">
+          <AlertDialogCancel>Cancel</AlertDialogCancel>
+          <div className="flex-grow" />
+          <AlertDialogAction
+            className={buttonVariants({ variant: "destructive" })}
+            onClick={() =>
+              deleteVariableValue
+                .mutateAsync(valueId)
+                .then(() => router.refresh())
+            }
+          >
+            Delete
+          </AlertDialogAction>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+};
+
+export const VariableValueDropdown: React.FC<{
+  value: VariableValue;
+  children: React.ReactNode;
+}> = ({ value, children }) => {
+  const [open, setOpen] = useState(false);
+  const update = api.deployment.variable.value.update.useMutation();
+  const router = useRouter();
+
+  return (
+    <DropdownMenu open={open} onOpenChange={setOpen}>
+      <DropdownMenuTrigger asChild>{children}</DropdownMenuTrigger>
+      <DropdownMenuContent>
+        <DropdownMenuGroup>
+          <TargetConditionDialog
+            condition={value.targetFilter ?? undefined}
+            onChange={(condition) =>
+              update
+                .mutateAsync({
+                  id: value.id,
+                  data: { targetFilter: condition },
+                })
+                .then(() => router.refresh())
+            }
+          >
+            <DropdownMenuItem
+              onSelect={(e) => e.preventDefault()}
+              className="flex items-center gap-2"
+            >
+              <IconTarget className="h-4 w-4" />
+              Assign targets
+            </DropdownMenuItem>
+          </TargetConditionDialog>
+          <DeleteVariableValueDialog
+            valueId={value.id}
+            onClose={() => setOpen(false)}
+          >
+            <DropdownMenuItem
+              onSelect={(e) => e.preventDefault()}
+              className="flex items-center gap-2"
+            >
+              <IconTrash className="h-4 w-4 text-red-500" />
+              Delete
+            </DropdownMenuItem>
+          </DeleteVariableValueDialog>
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/page.tsx
index fc493342f..ab6439b68 100644
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/page.tsx
@@ -1,4 +1,15 @@
+import type {
+  ComparisonCondition,
+  TargetCondition,
+} from "@ctrlplane/validators/targets";
 import { notFound } from "next/navigation";
+import LZString from "lz-string";
+import { isPresent } from "ts-is-present";
+
+import {
+  TargetFilterType,
+  TargetOperator,
+} from "@ctrlplane/validators/targets";
 
 import { api } from "~/trpc/server";
 import { VariableTable } from "./VariableTable";
@@ -10,7 +21,106 @@ export default async function VariablesPage({
 }) {
   const deployment = await api.deployment.bySlug(params);
   if (deployment == null) notFound();
-  const variables = await api.deployment.variable.byDeploymentId(deployment.id);
+  const { id: workspaceId } = deployment.system.workspace;
+  const variablesByDeployment = await api.deployment.variable.byDeploymentId(
+    deployment.id,
+  );
+
+  const systemTargetsFilter: ComparisonCondition = {
+    type: TargetFilterType.Comparison,
+    operator: TargetOperator.Or,
+    conditions: await api.environment
+      .bySystemId(deployment.systemId)
+      .then((envs) => envs.map((e) => e.targetFilter).filter(isPresent)),
+  };
+
+  const variablesPromises = variablesByDeployment.map(async (variable) => {
+    const defaultValue = variable.values.find(
+      (v) => v.id === variable.deploymentVariable.defaultValueId,
+    );
+    const rest = variable.values.filter((v) => v.id !== defaultValue?.id);
+
+    const valuesPromises = rest.map(async (v) => {
+      if (v.targetFilter == null)
+        return {
+          ...v,
+          targetCount: 0,
+          targets: [],
+          filterHash: "",
+        };
+
+      const filterHash = LZString.compressToEncodedURIComponent(
+        JSON.stringify(v.targetFilter),
+      );
+
+      const filter: ComparisonCondition = {
+        type: TargetFilterType.Comparison,
+        operator: TargetOperator.And,
+        conditions: [systemTargetsFilter, v.targetFilter],
+      };
+
+      const targets = await api.target.byWorkspaceId.list({
+        workspaceId,
+        filter,
+        limit: 5,
+      });
+
+      return {
+        ...v,
+        targetCount: targets.total,
+        targets: targets.items,
+        filterHash,
+      };
+    });
+
+    const values = await Promise.all(valuesPromises);
+
+    if (defaultValue != null) {
+      const restFilters = rest.map((v) => v.targetFilter).filter(isPresent);
+
+      const filter: TargetCondition =
+        restFilters.length === 0
+          ? systemTargetsFilter
+          : {
+              type: TargetFilterType.Comparison,
+              operator: TargetOperator.And,
+              conditions: [
+                systemTargetsFilter,
+                {
+                  type: TargetFilterType.Comparison,
+                  operator: TargetOperator.Or,
+                  not: true,
+                  conditions: restFilters,
+                },
+              ],
+            };
+
+      const defaultTargets = await api.target.byWorkspaceId.list({
+        workspaceId,
+        filter,
+        limit: 5,
+      });
+
+      const filterHash = LZString.compressToEncodedURIComponent(
+        JSON.stringify(filter),
+      );
+
+      values.unshift({
+        ...defaultValue,
+        targetCount: defaultTargets.total,
+        targets: defaultTargets.items,
+        filterHash,
+      });
+    }
+
+    return {
+      ...variable.deploymentVariable,
+      values,
+    };
+  });
+
+  const variables = await Promise.all(variablesPromises);
+
   return (
     <>
       <div className="h-full overflow-y-auto pb-[100px]">
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/variable-data.ts b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/variable-data.ts
new file mode 100644
index 000000000..c9fe9e23d
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/[deploymentSlug]/variables/variable-data.ts
@@ -0,0 +1,11 @@
+import type * as schema from "@ctrlplane/db/schema";
+
+export type VariableValue = schema.DeploymentVariableValue & {
+  targets: schema.Target[];
+  targetCount: number;
+  filterHash: string;
+};
+
+export type VariableData = schema.DeploymentVariable & {
+  values: VariableValue[];
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/TriggerRunbook.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/TriggerRunbook.tsx
index 687273457..c4ec3cc4e 100644
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/TriggerRunbook.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/TriggerRunbook.tsx
@@ -1,10 +1,6 @@
 "use client";
 
 import type { Runbook, RunbookVariable } from "@ctrlplane/db/schema";
-import type {
-  ChoiceVariableConfigType,
-  StringVariableConfigType,
-} from "@ctrlplane/validators/variables";
 import type { ReactNode } from "react";
 import React, { useState } from "react";
 import { useRouter } from "next/navigation";
@@ -22,77 +18,14 @@ import {
 } from "@ctrlplane/ui/dialog";
 import { Input } from "@ctrlplane/ui/input";
 import { Label } from "@ctrlplane/ui/label";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@ctrlplane/ui/select";
 import { Switch } from "@ctrlplane/ui/switch";
-import { Textarea } from "@ctrlplane/ui/textarea";
 
+import {
+  VariableChoiceSelect,
+  VariableStringInput,
+} from "~/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/VariableInputs";
 import { api } from "~/trpc/react";
 
-const VariableStringInput: React.FC<
-  StringVariableConfigType & {
-    value: string;
-    onChange: (v: string) => void;
-  }
-> = ({
-  value,
-  onChange,
-  inputType,
-  minLength,
-  maxLength,
-  default: defaultValue,
-}) => {
-  return (
-    <div>
-      {inputType === "text" && (
-        <Input
-          type="text"
-          value={value}
-          placeholder={defaultValue}
-          onChange={(e) => onChange(e.target.value)}
-          minLength={minLength}
-          maxLength={maxLength}
-        />
-      )}
-      {inputType === "text-area" && (
-        <Textarea
-          value={value}
-          onChange={(e) => onChange(e.target.value)}
-          minLength={minLength}
-          maxLength={maxLength}
-        />
-      )}
-    </div>
-  );
-};
-
-const VariableChoiceSelect: React.FC<
-  ChoiceVariableConfigType & {
-    value: string;
-    onSelect: (v: string) => void;
-  }
-> = ({ value, onSelect, options }) => {
-  return (
-    <Select value={value} onValueChange={onSelect}>
-      <SelectTrigger>
-        <SelectValue />
-      </SelectTrigger>
-      <SelectContent>
-        {options.map((o) => (
-          <SelectItem key={o} value={o}>
-            {o}
-          </SelectItem>
-        ))}
-      </SelectContent>
-    </Select>
-  );
-};
-
 export type TriggerRunbookDialogProps = {
   runbook: Runbook & { variables: RunbookVariable[] };
   children: ReactNode;
diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/create/RunbookVariableEditor.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/create/RunbookVariableEditor.tsx
index ee629ad51..d91acfcf9 100644
--- a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/create/RunbookVariableEditor.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/runbooks/create/RunbookVariableEditor.tsx
@@ -27,8 +27,9 @@ import {
   BooleanConfigFields,
   ChoiceConfigFields,
   ConfigTypeSelector,
+  NumberConfigFields,
   StringConfigFields,
-} from "./ConfigFields";
+} from "~/app/[workspaceSlug]/systems/[systemSlug]/_components/variables/ConfigFields";
 
 type RunbookVariableEditorProps = {
   value: InsertRunbookVariable;
@@ -46,9 +47,6 @@ export const RunbookVariableEditor = forwardRef<
   const updateConfig = (config: Partial<InsertRunbookVariable["config"]>) =>
     update({ config: _.merge(value.config, config) });
 
-  const setConfig = (config: InsertRunbookVariable["config"]) => {
-    onChange({ ...value, config });
-  };
   return (
     <div className="space-y-4" ref={ref}>
       <div className="space-y-1">
@@ -82,25 +80,16 @@ export const RunbookVariableEditor = forwardRef<
       </div>
 
       {config?.type === "string" && (
-        <StringConfigFields
-          config={config}
-          updateConfig={updateConfig}
-          setConfig={setConfig}
-        />
+        <StringConfigFields config={config} updateConfig={updateConfig} />
       )}
       {config?.type === "boolean" && (
-        <BooleanConfigFields
-          config={config}
-          updateConfig={updateConfig}
-          setConfig={setConfig}
-        />
+        <BooleanConfigFields config={config} updateConfig={updateConfig} />
       )}
       {config?.type === "choice" && (
-        <ChoiceConfigFields
-          config={config}
-          updateConfig={updateConfig}
-          setConfig={setConfig}
-        />
+        <ChoiceConfigFields config={config} updateConfig={updateConfig} />
+      )}
+      {config?.type === "number" && (
+        <NumberConfigFields config={config} updateConfig={updateConfig} />
       )}
 
       <pre>{JSON.stringify(config, null, 2)}</pre>
diff --git a/packages/api/src/router/deployment-variable.ts b/packages/api/src/router/deployment-variable.ts
index 3d4325cb0..23d92830a 100644
--- a/packages/api/src/router/deployment-variable.ts
+++ b/packages/api/src/router/deployment-variable.ts
@@ -1,20 +1,20 @@
+import type { DeploymentVariableValue } from "@ctrlplane/db/schema";
 import _ from "lodash";
 import { isPresent } from "ts-is-present";
 import { z } from "zod";
 
-import { and, eq, takeFirst, takeFirstOrNull } from "@ctrlplane/db";
+import { and, asc, eq, sql, takeFirst, takeFirstOrNull } from "@ctrlplane/db";
 import {
   createDeploymentVariable,
   createDeploymentVariableValue,
   deployment,
   deploymentVariable,
   deploymentVariableValue,
-  deploymentVariableValueTarget,
-  deploymentVariableValueTargetFilter,
   system,
   target,
   targetMatchesMetadata,
   updateDeploymentVariable,
+  updateDeploymentVariableValue,
 } from "@ctrlplane/db/schema";
 import { Permission } from "@ctrlplane/validators/auth";
 
@@ -30,13 +30,66 @@ const valueRouter = createTRPCRouter({
           .where(eq(deploymentVariable.id, input.variableId))
           .then(takeFirst);
         return canUser
-          .perform(Permission.DeploymentUpdate)
+          .perform(Permission.DeploymentVariableCreate)
           .on({ type: "deployment", id: variable.deploymentId });
       },
     })
     .input(createDeploymentVariableValue)
     .mutation(async ({ ctx, input }) =>
-      ctx.db.insert(deploymentVariableValue).values(input).returning(),
+      ctx.db.transaction((tx) =>
+        tx
+          .insert(deploymentVariableValue)
+          .values(input)
+          .returning()
+          .then(takeFirst)
+          .then(async (value) => {
+            if (input.default)
+              await tx
+                .update(deploymentVariable)
+                .set({ defaultValueId: value.id })
+                .where(eq(deploymentVariable.id, input.variableId));
+
+            return value;
+          }),
+      ),
+    ),
+
+  update: protectedProcedure
+    .meta({
+      authorizationCheck: async ({ canUser, ctx, input }) => {
+        const value = await ctx.db
+          .select()
+          .from(deploymentVariableValue)
+          .where(eq(deploymentVariableValue.id, input.id))
+          .then(takeFirstOrNull);
+
+        if (value == null) return false;
+
+        return canUser.perform(Permission.DeploymentVariableUpdate).on({
+          type: "deploymentVariable",
+          id: value.variableId,
+        });
+      },
+    })
+    .input(
+      z.object({ id: z.string().uuid(), data: updateDeploymentVariableValue }),
+    )
+    .mutation(async ({ ctx, input }) =>
+      ctx.db
+        .update(deploymentVariableValue)
+        .set(input.data)
+        .where(eq(deploymentVariableValue.id, input.id))
+        .returning()
+        .then(takeFirst)
+        .then(async (value) => {
+          if (input.data.default)
+            await ctx.db
+              .update(deploymentVariable)
+              .set({ defaultValueId: value.id })
+              .where(eq(deploymentVariable.id, value.variableId));
+
+          return value;
+        }),
     ),
 
   delete: protectedProcedure
@@ -51,7 +104,7 @@ const valueRouter = createTRPCRouter({
           )
           .where(eq(deploymentVariableValue.id, input))
           .then(takeFirst);
-        return canUser.perform(Permission.DeploymentUpdate).on({
+        return canUser.perform(Permission.DeploymentVariableUpdate).on({
           type: "deployment",
           id: value.deployment_variable.deploymentId,
         });
@@ -69,80 +122,6 @@ const valueRouter = createTRPCRouter({
         .returning()
         .then(takeFirstOrNull);
     }),
-
-  setTarget: protectedProcedure
-    .meta({
-      authorizationCheck: ({ canUser, input }) =>
-        canUser
-          .perform(Permission.DeploymentUpdate)
-          .on({ type: "target", id: input.targetId }),
-    })
-    .input(
-      z.object({
-        targetId: z.string().uuid(),
-        variableId: z.string().uuid(),
-        value: z.any(),
-      }),
-    )
-    .mutation(async ({ ctx, input }) => {
-      if (input.value == null) {
-        const vv = await ctx.db
-          .select()
-          .from(deploymentVariableValue)
-          .innerJoin(
-            deploymentVariableValueTarget,
-            eq(
-              deploymentVariableValue.id,
-              deploymentVariableValueTarget.variableValueId,
-            ),
-          )
-          .where(
-            and(
-              eq(deploymentVariableValue.variableId, input.variableId),
-              eq(deploymentVariableValueTarget.targetId, input.targetId),
-            ),
-          )
-          .then(takeFirstOrNull);
-
-        if (vv == null)
-          // value is already not set.
-          return;
-
-        return ctx.db
-          .delete(deploymentVariableValueTarget)
-          .where(
-            and(
-              eq(
-                deploymentVariableValueTarget.variableValueId,
-                vv.deployment_variable_value.id,
-              ),
-              eq(deploymentVariableValueTarget.targetId, input.targetId),
-            ),
-          )
-          .returning();
-      }
-
-      const value = await ctx.db
-        .insert(deploymentVariableValue)
-        .values({ variableId: input.variableId, value: input.value })
-        .onConflictDoUpdate({
-          target: [
-            deploymentVariableValue.variableId,
-            deploymentVariableValue.value,
-          ],
-          set: { value: input.value },
-        })
-        .returning()
-        .then(takeFirst);
-
-      return ctx.db
-        .insert(deploymentVariableValueTarget)
-        .values({
-          variableValueId: value.id,
-          targetId: input.targetId,
-        })
-        .returning();
-    }),
 });
 
 export const deploymentVariableRouter = createTRPCRouter({
@@ -157,17 +136,6 @@ export const deploymentVariableRouter = createTRPCRouter({
     })
     .input(z.string().uuid())
     .query(async ({ ctx, input }) => {
-      const possibleValuesSubquery = ctx.db
-        .select({
-          id: deploymentVariableValue.id,
-          value: deploymentVariableValue.value,
-          variableId: deploymentVariableValue.variableId,
-        })
-        .from(deploymentVariableValue)
-        .as("possible_values_subquery");
-
-      // get all deployment variable value target filters matching the target
-      // then get all the deployment variable values + the deployment variable itself
       const deploymentVariables = await ctx.db
         .select()
         .from(target)
@@ -178,35 +146,22 @@ export const deploymentVariableRouter = createTRPCRouter({
           deploymentVariable,
           eq(deploymentVariable.deploymentId, deployment.id),
         )
-        .innerJoin(
-          possibleValuesSubquery,
-          eq(possibleValuesSubquery.variableId, deploymentVariable.id),
-        )
         .innerJoin(
           deploymentVariableValue,
           eq(deploymentVariableValue.variableId, deploymentVariable.id),
         )
-        .innerJoin(
-          deploymentVariableValueTargetFilter,
-          eq(
-            deploymentVariableValueTargetFilter.variableValueId,
-            deploymentVariableValue.id,
-          ),
-        )
         .then((rows) =>
           _.chain(rows)
             .groupBy((r) => r.deployment_variable.id)
             .map((r) => ({
               ...r[0]!.deployment_variable,
-              targetFilter:
-                r[0]!.deployment_variable_value_target_filter.targetFilter,
+              targetFilter: r[0]!.deployment_variable_value.targetFilter,
               value: r[0]!.deployment_variable_value,
-              possibleValues: r.map((r) => r.possible_values_subquery),
             }))
             .value(),
         );
 
-      const filterMatches = await Promise.all(
+      return Promise.all(
         deploymentVariables.map(async (deploymentVariable) => {
           const { targetFilter } = deploymentVariable;
 
@@ -226,44 +181,9 @@ export const deploymentVariableRouter = createTRPCRouter({
           return {
             ...deploymentVariable,
             value: deploymentVariable.value,
-            possibleValues: deploymentVariable.possibleValues,
           };
         }),
       ).then((rows) => rows.filter(isPresent));
-
-      // get all the deployment variable value targets that are direct matches
-      // then get all the deployment variable values + the deployment variable itself
-      const directMatches = await ctx.db
-        .select()
-        .from(deploymentVariable)
-        .innerJoin(
-          possibleValuesSubquery,
-          eq(possibleValuesSubquery.variableId, deploymentVariable.id),
-        )
-        .innerJoin(
-          deploymentVariableValue,
-          eq(deploymentVariableValue.variableId, deploymentVariable.id),
-        )
-        .innerJoin(
-          deploymentVariableValueTarget,
-          eq(
-            deploymentVariableValueTarget.variableValueId,
-            deploymentVariableValue.id,
-          ),
-        )
-        .where(eq(deploymentVariableValueTarget.targetId, input))
-        .then((rows) =>
-          _.chain(rows)
-            .groupBy((row) => row.deployment_variable.id)
-            .map((row) => ({
-              ...row[0]!.deployment_variable,
-              value: row[0]!.deployment_variable_value,
-              possibleValues: row.map((r) => r.possible_values_subquery),
-            }))
-            .value(),
-        );
-
-      return [...filterMatches, ...directMatches];
     }),
 
   byDeploymentId: protectedProcedure
@@ -274,38 +194,47 @@ export const deploymentVariableRouter = createTRPCRouter({
           .on({ type: "deployment", id: input }),
     })
     .input(z.string().uuid())
-    .query(async ({ ctx, input }) =>
-      ctx.db
-        .select()
+    .query(async ({ ctx, input }) => {
+      const deploymentVariableValueSubquery = ctx.db
+        .select({
+          id: deploymentVariableValue.id,
+          value: deploymentVariableValue.value,
+          variableId: deploymentVariableValue.variableId,
+          targetFilter: deploymentVariableValue.targetFilter,
+        })
+        .from(deploymentVariableValue)
+        .orderBy(asc(deploymentVariableValue.value))
+        .groupBy(deploymentVariableValue.id)
+        .as("deployment_variable_value_subquery");
+
+      return ctx.db
+        .select({
+          deploymentVariable: deploymentVariable,
+          values: sql<DeploymentVariableValue[]>`
+            coalesce(
+              array_agg(
+                case when ${deploymentVariableValueSubquery.id} is not null then
+                  json_build_object(
+                    'id', ${deploymentVariableValueSubquery.id},
+                    'value', ${deploymentVariableValueSubquery.value},
+                    'variableId', ${deploymentVariableValueSubquery.variableId},
+                    'targetFilter', ${deploymentVariableValueSubquery.targetFilter}
+                  )
+                else null end
+              ) filter (where ${deploymentVariableValueSubquery.id} is not null),
+              array[]::json[]
+            )
+          `.as("values"),
+        })
         .from(deploymentVariable)
         .leftJoin(
-          deploymentVariableValue,
-          eq(deploymentVariable.id, deploymentVariableValue.variableId),
-        )
-        .leftJoin(
-          deploymentVariableValueTarget,
-          eq(
-            deploymentVariableValueTarget.variableValueId,
-            deploymentVariableValue.id,
-          ),
+          deploymentVariableValueSubquery,
+          eq(deploymentVariable.id, deploymentVariableValueSubquery.variableId),
         )
-        .where(eq(deploymentVariable.deploymentId, input))
-        .then((rows) => {
-          return _.chain(rows)
-            .groupBy((row) => row.deployment_variable.id)
-            .map((row) => ({
-              ...row[0]!.deployment_variable,
-              values: _.chain(row)
-                .groupBy((r) => r.deployment_variable_value?.id)
-                .map((r) => ({
-                  ...r[0]!.deployment_variable_value!,
-                  targets: r.map((r) => r.deployment_variable_value_target!),
-                }))
-                .value(),
-            }))
-            .value();
-        }),
-    ),
+        .groupBy(deploymentVariable.id)
+        .orderBy(asc(deploymentVariable.key))
+        .where(eq(deploymentVariable.deploymentId, input));
+    }),
 
   create: protectedProcedure
     .meta({
@@ -315,22 +244,38 @@ export const deploymentVariableRouter = createTRPCRouter({
           .on({ type: "deployment", id: input.deploymentId }),
     })
     .input(createDeploymentVariable)
-    .mutation(async ({ ctx, input }) =>
-      ctx.db.insert(deploymentVariable).values(input).returning(),
-    ),
+    .mutation(async ({ ctx, input }) => {
+      const variable = await ctx.db
+        .insert(deploymentVariable)
+        .values(input)
+        .returning()
+        .then(takeFirst);
+
+      if (input.config?.default) {
+        const value = await ctx.db
+          .insert(deploymentVariableValue)
+          .values({
+            variableId: variable.id,
+            value: input.config.default,
+          })
+          .returning()
+          .then(takeFirst);
+
+        await ctx.db
+          .update(deploymentVariable)
+          .set({ defaultValueId: value.id })
+          .where(eq(deploymentVariable.id, variable.id));
+      }
+
+      return variable;
+    }),
 
   update: protectedProcedure
     .meta({
-      authorizationCheck: async ({ canUser, ctx, input }) => {
-        const variable = await ctx.db
-          .select()
-          .from(deploymentVariable)
-          .where(eq(deploymentVariable.id, input.id))
-          .then(takeFirst);
-        return canUser
-          .perform(Permission.DeploymentUpdate)
-          .on({ type: "deployment", id: variable.deploymentId });
-      },
+      authorizationCheck: async ({ canUser, input }) =>
+        canUser
+          .perform(Permission.DeploymentVariableUpdate)
+          .on({ type: "deploymentVariable", id: input.id }),
     })
     .input(z.object({ id: z.string().uuid(), data: updateDeploymentVariable }))
     .mutation(async ({ ctx, input }) =>
@@ -339,4 +284,21 @@ export const deploymentVariableRouter = createTRPCRouter({
         .set(input.data)
         .where(eq(deploymentVariable.id, input.id)),
     ),
+
+  delete: protectedProcedure
+    .meta({
+      authorizationCheck: async ({ canUser, input }) =>
+        canUser.perform(Permission.DeploymentVariableDelete).on({
+          type: "deploymentVariable",
+          id: input,
+        }),
+    })
+    .input(z.string().uuid())
+    .mutation(async ({ ctx, input }) => {
+      return ctx.db
+        .delete(deploymentVariable)
+        .where(eq(deploymentVariable.id, input))
+        .returning()
+        .then(takeFirstOrNull);
+    }),
 });
diff --git a/packages/auth/src/utils/rbac.ts b/packages/auth/src/utils/rbac.ts
index 532edb2f6..472ceb030 100644
--- a/packages/auth/src/utils/rbac.ts
+++ b/packages/auth/src/utils/rbac.ts
@@ -4,6 +4,7 @@ import { and, eq, inArray, takeFirst } from "@ctrlplane/db";
 import { db } from "@ctrlplane/db/client";
 import {
   deployment,
+  deploymentVariable,
   entityRole,
   environment,
   environmentPolicy,
@@ -205,6 +206,27 @@ const getDeploymentScopes = async (id: string) => {
   ];
 };
 
+const getDeploymentVariableScopes = async (id: string) => {
+  const result = await db
+    .select()
+    .from(workspace)
+    .innerJoin(system, eq(system.workspaceId, workspace.id))
+    .innerJoin(deployment, eq(deployment.systemId, system.id))
+    .innerJoin(
+      deploymentVariable,
+      eq(deploymentVariable.deploymentId, deployment.id),
+    )
+    .where(eq(deploymentVariable.id, id))
+    .then(takeFirst);
+
+  return [
+    { type: "deploymentVariable" as const, id: result.deployment_variable.id },
+    { type: "deployment" as const, id: result.deployment.id },
+    { type: "system" as const, id: result.system.id },
+    { type: "workspace" as const, id: result.workspace.id },
+  ];
+};
+
 const getRunbookScopes = async (id: string) => {
   const result = await db
     .select()
@@ -268,6 +290,7 @@ export const scopeHandlers: Record<
   target: getTargetScopes,
   targetProvider: getTargetProviderScopes,
   deployment: getDeploymentScopes,
+  deploymentVariable: getDeploymentVariableScopes,
   runbook: getRunbookScopes,
   system: getSystemScopes,
   workspace: getWorkspaceScopes,
diff --git a/packages/db/drizzle/0004_loving_dormammu.sql b/packages/db/drizzle/0004_loving_dormammu.sql
new file mode 100644
index 000000000..9ec2c2fb8
--- /dev/null
+++ b/packages/db/drizzle/0004_loving_dormammu.sql
@@ -0,0 +1,18 @@
+ALTER TYPE "scope_type" ADD VALUE 'deploymentVariable';--> statement-breakpoint
+DROP TABLE "deployment_variable_value_target";--> statement-breakpoint
+DROP TABLE "deployment_variable_value_target_filter";--> statement-breakpoint
+ALTER TABLE "deployment_variable_value" DROP CONSTRAINT "deployment_variable_value_variable_id_deployment_variable_id_fk";
+--> statement-breakpoint
+ALTER TABLE "deployment_variable" ADD COLUMN "default_value_id" uuid DEFAULT NULL;--> statement-breakpoint
+ALTER TABLE "deployment_variable_value" ADD COLUMN "target_filter" jsonb DEFAULT NULL;--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "deployment_variable" ADD CONSTRAINT "deployment_variable_default_value_id_deployment_variable_value_id_fk" FOREIGN KEY ("default_value_id") REFERENCES "public"."deployment_variable_value"("id") ON DELETE set null ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "deployment_variable_value" ADD CONSTRAINT "deployment_variable_value_variable_id_deployment_variable_id_fk" FOREIGN KEY ("variable_id") REFERENCES "public"."deployment_variable"("id") ON DELETE cascade ON UPDATE restrict;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
diff --git a/packages/db/drizzle/meta/0004_snapshot.json b/packages/db/drizzle/meta/0004_snapshot.json
new file mode 100644
index 000000000..2253a1c3e
--- /dev/null
+++ b/packages/db/drizzle/meta/0004_snapshot.json
@@ -0,0 +1,3434 @@
+{
+  "id": "b9a6539a-00f3-4d71-9809-0895dee19d99",
+  "prevId": "f4144a38-d3f7-4f98-b87f-04cf178943d7",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "userId": {
+          "name": "userId",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "providerAccountId": {
+          "name": "providerAccountId",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_type": {
+          "name": "token_type",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "session_state": {
+          "name": "session_state",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "account_userId_user_id_fk": {
+          "name": "account_userId_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": ["userId"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "account_provider_providerAccountId_pk": {
+          "name": "account_provider_providerAccountId_pk",
+          "columns": ["provider", "providerAccountId"]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "public.session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "sessionToken": {
+          "name": "sessionToken",
+          "type": "varchar(255)",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "userId": {
+          "name": "userId",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_userId_user_id_fk": {
+          "name": "session_userId_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": ["userId"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image": {
+          "name": "image",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "active_workspace_id": {
+          "name": "active_workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "null"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_active_workspace_id_workspace_id_fk": {
+          "name": "user_active_workspace_id_workspace_id_fk",
+          "tableFrom": "user",
+          "tableTo": "workspace",
+          "columnsFrom": ["active_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.user_api_key": {
+      "name": "user_api_key",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key_preview": {
+          "name": "key_preview",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key_hash": {
+          "name": "key_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key_prefix": {
+          "name": "key_prefix",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "user_api_key_key_prefix_key_hash_index": {
+          "name": "user_api_key_key_prefix_key_hash_index",
+          "columns": [
+            {
+              "expression": "key_prefix",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "user_api_key_user_id_user_id_fk": {
+          "name": "user_api_key_user_id_user_id_fk",
+          "tableFrom": "user_api_key",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.dashboard": {
+      "name": "dashboard",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "dashboard_workspace_id_workspace_id_fk": {
+          "name": "dashboard_workspace_id_workspace_id_fk",
+          "tableFrom": "dashboard",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.dashboard_widget": {
+      "name": "dashboard_widget",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "dashboard_id": {
+          "name": "dashboard_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "widget": {
+          "name": "widget",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "x": {
+          "name": "x",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "y": {
+          "name": "y",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "w": {
+          "name": "w",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "h": {
+          "name": "h",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "dashboard_widget_dashboard_id_dashboard_id_fk": {
+          "name": "dashboard_widget_dashboard_id_dashboard_id_fk",
+          "tableFrom": "dashboard_widget",
+          "tableTo": "dashboard",
+          "columnsFrom": ["dashboard_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.deployment_variable": {
+      "name": "deployment_variable",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "deployment_id": {
+          "name": "deployment_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "default_value_id": {
+          "name": "default_value_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "NULL"
+        },
+        "schema": {
+          "name": "schema",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "deployment_variable_deployment_id_key_index": {
+          "name": "deployment_variable_deployment_id_key_index",
+          "columns": [
+            {
+              "expression": "deployment_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "deployment_variable_deployment_id_deployment_id_fk": {
+          "name": "deployment_variable_deployment_id_deployment_id_fk",
+          "tableFrom": "deployment_variable",
+          "tableTo": "deployment",
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "deployment_variable_default_value_id_deployment_variable_value_id_fk": {
+          "name": "deployment_variable_default_value_id_deployment_variable_value_id_fk",
+          "tableFrom": "deployment_variable",
+          "tableTo": "deployment_variable_value",
+          "columnsFrom": ["default_value_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.deployment_variable_set": {
+      "name": "deployment_variable_set",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "deployment_id": {
+          "name": "deployment_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variable_set_id": {
+          "name": "variable_set_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "deployment_variable_set_deployment_id_variable_set_id_index": {
+          "name": "deployment_variable_set_deployment_id_variable_set_id_index",
+          "columns": [
+            {
+              "expression": "deployment_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "variable_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "deployment_variable_set_deployment_id_deployment_id_fk": {
+          "name": "deployment_variable_set_deployment_id_deployment_id_fk",
+          "tableFrom": "deployment_variable_set",
+          "tableTo": "deployment",
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "deployment_variable_set_variable_set_id_variable_set_id_fk": {
+          "name": "deployment_variable_set_variable_set_id_variable_set_id_fk",
+          "tableFrom": "deployment_variable_set",
+          "tableTo": "variable_set",
+          "columnsFrom": ["variable_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.deployment_variable_value": {
+      "name": "deployment_variable_value",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "variable_id": {
+          "name": "variable_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_filter": {
+          "name": "target_filter",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "NULL"
+        }
+      },
+      "indexes": {
+        "deployment_variable_value_variable_id_value_index": {
+          "name": "deployment_variable_value_variable_id_value_index",
+          "columns": [
+            {
+              "expression": "variable_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "value",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "deployment_variable_value_variable_id_deployment_variable_id_fk": {
+          "name": "deployment_variable_value_variable_id_deployment_variable_id_fk",
+          "tableFrom": "deployment_variable_value",
+          "tableTo": "deployment_variable",
+          "columnsFrom": ["variable_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "restrict"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.deployment": {
+      "name": "deployment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "system_id": {
+          "name": "system_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "job_agent_id": {
+          "name": "job_agent_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_agent_config": {
+          "name": "job_agent_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "github_config_file_id": {
+          "name": "github_config_file_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "deployment_system_id_slug_index": {
+          "name": "deployment_system_id_slug_index",
+          "columns": [
+            {
+              "expression": "system_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "deployment_system_id_system_id_fk": {
+          "name": "deployment_system_id_system_id_fk",
+          "tableFrom": "deployment",
+          "tableTo": "system",
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "deployment_job_agent_id_job_agent_id_fk": {
+          "name": "deployment_job_agent_id_job_agent_id_fk",
+          "tableFrom": "deployment",
+          "tableTo": "job_agent",
+          "columnsFrom": ["job_agent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "deployment_github_config_file_id_github_config_file_id_fk": {
+          "name": "deployment_github_config_file_id_github_config_file_id_fk",
+          "tableFrom": "deployment",
+          "tableTo": "github_config_file",
+          "columnsFrom": ["github_config_file_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.deployment_meta_dependency": {
+      "name": "deployment_meta_dependency",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deployment_id": {
+          "name": "deployment_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "depends_on_id": {
+          "name": "depends_on_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "deployment_meta_dependency_depends_on_id_deployment_id_index": {
+          "name": "deployment_meta_dependency_depends_on_id_deployment_id_index",
+          "columns": [
+            {
+              "expression": "depends_on_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "deployment_meta_dependency_deployment_id_deployment_id_fk": {
+          "name": "deployment_meta_dependency_deployment_id_deployment_id_fk",
+          "tableFrom": "deployment_meta_dependency",
+          "tableTo": "deployment",
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "deployment_meta_dependency_depends_on_id_deployment_id_fk": {
+          "name": "deployment_meta_dependency_depends_on_id_deployment_id_fk",
+          "tableFrom": "deployment_meta_dependency",
+          "tableTo": "deployment",
+          "columnsFrom": ["depends_on_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.environment": {
+      "name": "environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "system_id": {
+          "name": "system_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "''"
+        },
+        "policy_id": {
+          "name": "policy_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "target_filter": {
+          "name": "target_filter",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "NULL"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "environment_system_id_system_id_fk": {
+          "name": "environment_system_id_system_id_fk",
+          "tableFrom": "environment",
+          "tableTo": "system",
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "environment_policy_id_environment_policy_id_fk": {
+          "name": "environment_policy_id_environment_policy_id_fk",
+          "tableFrom": "environment",
+          "tableTo": "environment_policy",
+          "columnsFrom": ["policy_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.environment_policy": {
+      "name": "environment_policy",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "system_id": {
+          "name": "system_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "approval_required": {
+          "name": "approval_required",
+          "type": "environment_policy_approval_requirement",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'manual'"
+        },
+        "success_status": {
+          "name": "success_status",
+          "type": "environment_policy_deployment_success_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'all'"
+        },
+        "minimum_success": {
+          "name": "minimum_success",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "concurrency_type": {
+          "name": "concurrency_type",
+          "type": "concurrency_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'all'"
+        },
+        "concurrency_limit": {
+          "name": "concurrency_limit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1
+        },
+        "duration": {
+          "name": "duration",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "evaluate_with": {
+          "name": "evaluate_with",
+          "type": "evaluation_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        },
+        "evaluate": {
+          "name": "evaluate",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "release_sequencing": {
+          "name": "release_sequencing",
+          "type": "release_sequencing_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'cancel'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "environment_policy_system_id_system_id_fk": {
+          "name": "environment_policy_system_id_system_id_fk",
+          "tableFrom": "environment_policy",
+          "tableTo": "system",
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.environment_policy_approval": {
+      "name": "environment_policy_approval",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "policy_id": {
+          "name": "policy_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "release_id": {
+          "name": "release_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "approval_status_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        }
+      },
+      "indexes": {
+        "environment_policy_approval_policy_id_release_id_index": {
+          "name": "environment_policy_approval_policy_id_release_id_index",
+          "columns": [
+            {
+              "expression": "policy_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "release_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "environment_policy_approval_policy_id_environment_policy_id_fk": {
+          "name": "environment_policy_approval_policy_id_environment_policy_id_fk",
+          "tableFrom": "environment_policy_approval",
+          "tableTo": "environment_policy",
+          "columnsFrom": ["policy_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "environment_policy_approval_release_id_release_id_fk": {
+          "name": "environment_policy_approval_release_id_release_id_fk",
+          "tableFrom": "environment_policy_approval",
+          "tableTo": "release",
+          "columnsFrom": ["release_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.environment_policy_deployment": {
+      "name": "environment_policy_deployment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "policy_id": {
+          "name": "policy_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "environment_policy_deployment_policy_id_environment_id_index": {
+          "name": "environment_policy_deployment_policy_id_environment_id_index",
+          "columns": [
+            {
+              "expression": "policy_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "environment_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "environment_policy_deployment_policy_id_environment_policy_id_fk": {
+          "name": "environment_policy_deployment_policy_id_environment_policy_id_fk",
+          "tableFrom": "environment_policy_deployment",
+          "tableTo": "environment_policy",
+          "columnsFrom": ["policy_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "environment_policy_deployment_environment_id_environment_id_fk": {
+          "name": "environment_policy_deployment_environment_id_environment_id_fk",
+          "tableFrom": "environment_policy_deployment",
+          "tableTo": "environment",
+          "columnsFrom": ["environment_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.environment_policy_release_window": {
+      "name": "environment_policy_release_window",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "policy_id": {
+          "name": "policy_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "start_time": {
+          "name": "start_time",
+          "type": "timestamp (0) with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "end_time": {
+          "name": "end_time",
+          "type": "timestamp (0) with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "recurrence": {
+          "name": "recurrence",
+          "type": "recurrence_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "environment_policy_release_window_policy_id_environment_policy_id_fk": {
+          "name": "environment_policy_release_window_policy_id_environment_policy_id_fk",
+          "tableFrom": "environment_policy_release_window",
+          "tableTo": "environment_policy",
+          "columnsFrom": ["policy_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.github_config_file": {
+      "name": "github_config_file",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repository_name": {
+          "name": "repository_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_synced_at": {
+          "name": "last_synced_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "unique_organization_repository_path": {
+          "name": "unique_organization_repository_path",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "repository_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "path",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "github_config_file_organization_id_github_organization_id_fk": {
+          "name": "github_config_file_organization_id_github_organization_id_fk",
+          "tableFrom": "github_config_file",
+          "tableTo": "github_organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "github_config_file_workspace_id_workspace_id_fk": {
+          "name": "github_config_file_workspace_id_workspace_id_fk",
+          "tableFrom": "github_config_file",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.github_organization": {
+      "name": "github_organization",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_name": {
+          "name": "organization_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "added_by_user_id": {
+          "name": "added_by_user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'main'"
+        }
+      },
+      "indexes": {
+        "unique_installation_workspace": {
+          "name": "unique_installation_workspace",
+          "columns": [
+            {
+              "expression": "installation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "github_organization_added_by_user_id_user_id_fk": {
+          "name": "github_organization_added_by_user_id_user_id_fk",
+          "tableFrom": "github_organization",
+          "tableTo": "user",
+          "columnsFrom": ["added_by_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "github_organization_workspace_id_workspace_id_fk": {
+          "name": "github_organization_workspace_id_workspace_id_fk",
+          "tableFrom": "github_organization",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.github_user": {
+      "name": "github_user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "github_user_id": {
+          "name": "github_user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "github_username": {
+          "name": "github_username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "github_user_user_id_user_id_fk": {
+          "name": "github_user_user_id_user_id_fk",
+          "tableFrom": "github_user",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.target": {
+      "name": "target",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "kind": {
+          "name": "kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "locked_at": {
+          "name": "locked_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "target_identifier_workspace_id_index": {
+          "name": "target_identifier_workspace_id_index",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "target_provider_id_target_provider_id_fk": {
+          "name": "target_provider_id_target_provider_id_fk",
+          "tableFrom": "target",
+          "tableTo": "target_provider",
+          "columnsFrom": ["provider_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "target_workspace_id_workspace_id_fk": {
+          "name": "target_workspace_id_workspace_id_fk",
+          "tableFrom": "target",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.target_metadata": {
+      "name": "target_metadata",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "target_id": {
+          "name": "target_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "target_metadata_key_target_id_index": {
+          "name": "target_metadata_key_target_id_index",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "target_metadata_target_id_target_id_fk": {
+          "name": "target_metadata_target_id_target_id_fk",
+          "tableFrom": "target_metadata",
+          "tableTo": "target",
+          "columnsFrom": ["target_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.target_schema": {
+      "name": "target_schema",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "kind": {
+          "name": "kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "json_schema": {
+          "name": "json_schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "target_schema_version_kind_workspace_id_index": {
+          "name": "target_schema_version_kind_workspace_id_index",
+          "columns": [
+            {
+              "expression": "version",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "kind",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "target_schema_workspace_id_workspace_id_fk": {
+          "name": "target_schema_workspace_id_workspace_id_fk",
+          "tableFrom": "target_schema",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.target_provider": {
+      "name": "target_provider",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "target_provider_workspace_id_name_index": {
+          "name": "target_provider_workspace_id_name_index",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "target_provider_workspace_id_workspace_id_fk": {
+          "name": "target_provider_workspace_id_workspace_id_fk",
+          "tableFrom": "target_provider",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.target_provider_google": {
+      "name": "target_provider_google",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "target_provider_id": {
+          "name": "target_provider_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "project_ids": {
+          "name": "project_ids",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "target_provider_google_target_provider_id_target_provider_id_fk": {
+          "name": "target_provider_google_target_provider_id_target_provider_id_fk",
+          "tableFrom": "target_provider_google",
+          "tableTo": "target_provider",
+          "columnsFrom": ["target_provider_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.release": {
+      "name": "release",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "''"
+        },
+        "deployment_id": {
+          "name": "deployment_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "release_deployment_id_version_index": {
+          "name": "release_deployment_id_version_index",
+          "columns": [
+            {
+              "expression": "deployment_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "version",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "release_deployment_id_deployment_id_fk": {
+          "name": "release_deployment_id_deployment_id_fk",
+          "tableFrom": "release",
+          "tableTo": "deployment",
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.release_dependency": {
+      "name": "release_dependency",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "release_id": {
+          "name": "release_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_id": {
+          "name": "deployment_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_metadata_group_id": {
+          "name": "target_metadata_group_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rule_type": {
+          "name": "rule_type",
+          "type": "release_dependency_rule_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "rule": {
+          "name": "rule",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "release_dependency_release_id_deployment_id_target_metadata_group_id_index": {
+          "name": "release_dependency_release_id_deployment_id_target_metadata_group_id_index",
+          "columns": [
+            {
+              "expression": "release_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_metadata_group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "release_dependency_release_id_release_id_fk": {
+          "name": "release_dependency_release_id_release_id_fk",
+          "tableFrom": "release_dependency",
+          "tableTo": "release",
+          "columnsFrom": ["release_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "release_dependency_deployment_id_deployment_id_fk": {
+          "name": "release_dependency_deployment_id_deployment_id_fk",
+          "tableFrom": "release_dependency",
+          "tableTo": "deployment",
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "release_dependency_target_metadata_group_id_target_metadata_group_id_fk": {
+          "name": "release_dependency_target_metadata_group_id_target_metadata_group_id_fk",
+          "tableFrom": "release_dependency",
+          "tableTo": "target_metadata_group",
+          "columnsFrom": ["target_metadata_group_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.release_job_trigger": {
+      "name": "release_job_trigger",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "job_id": {
+          "name": "job_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "release_job_trigger_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "caused_by_id": {
+          "name": "caused_by_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "release_id": {
+          "name": "release_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_id": {
+          "name": "target_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "release_job_trigger_job_id_job_id_fk": {
+          "name": "release_job_trigger_job_id_job_id_fk",
+          "tableFrom": "release_job_trigger",
+          "tableTo": "job",
+          "columnsFrom": ["job_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "release_job_trigger_caused_by_id_user_id_fk": {
+          "name": "release_job_trigger_caused_by_id_user_id_fk",
+          "tableFrom": "release_job_trigger",
+          "tableTo": "user",
+          "columnsFrom": ["caused_by_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "release_job_trigger_release_id_release_id_fk": {
+          "name": "release_job_trigger_release_id_release_id_fk",
+          "tableFrom": "release_job_trigger",
+          "tableTo": "release",
+          "columnsFrom": ["release_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "release_job_trigger_target_id_target_id_fk": {
+          "name": "release_job_trigger_target_id_target_id_fk",
+          "tableFrom": "release_job_trigger",
+          "tableTo": "target",
+          "columnsFrom": ["target_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "release_job_trigger_environment_id_environment_id_fk": {
+          "name": "release_job_trigger_environment_id_environment_id_fk",
+          "tableFrom": "release_job_trigger",
+          "tableTo": "environment",
+          "columnsFrom": ["environment_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "release_job_trigger_job_id_unique": {
+          "name": "release_job_trigger_job_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["job_id"]
+        }
+      }
+    },
+    "public.system": {
+      "name": "system",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "system_workspace_id_slug_index": {
+          "name": "system_workspace_id_slug_index",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "system_workspace_id_workspace_id_fk": {
+          "name": "system_workspace_id_workspace_id_fk",
+          "tableFrom": "system",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.runbook": {
+      "name": "runbook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "system_id": {
+          "name": "system_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "job_agent_id": {
+          "name": "job_agent_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_agent_config": {
+          "name": "job_agent_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "runbook_system_id_system_id_fk": {
+          "name": "runbook_system_id_system_id_fk",
+          "tableFrom": "runbook",
+          "tableTo": "system",
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "runbook_job_agent_id_job_agent_id_fk": {
+          "name": "runbook_job_agent_id_job_agent_id_fk",
+          "tableFrom": "runbook",
+          "tableTo": "job_agent",
+          "columnsFrom": ["job_agent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.runbook_job_trigger": {
+      "name": "runbook_job_trigger",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "job_id": {
+          "name": "job_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "runbook_id": {
+          "name": "runbook_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "runbook_job_trigger_job_id_job_id_fk": {
+          "name": "runbook_job_trigger_job_id_job_id_fk",
+          "tableFrom": "runbook_job_trigger",
+          "tableTo": "job",
+          "columnsFrom": ["job_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "runbook_job_trigger_runbook_id_runbook_id_fk": {
+          "name": "runbook_job_trigger_runbook_id_runbook_id_fk",
+          "tableFrom": "runbook_job_trigger",
+          "tableTo": "runbook",
+          "columnsFrom": ["runbook_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "runbook_job_trigger_job_id_unique": {
+          "name": "runbook_job_trigger_job_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["job_id"]
+        }
+      }
+    },
+    "public.team": {
+      "name": "team",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "text": {
+          "name": "text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "team_workspace_id_workspace_id_fk": {
+          "name": "team_workspace_id_workspace_id_fk",
+          "tableFrom": "team",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.team_member": {
+      "name": "team_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "team_id": {
+          "name": "team_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "team_member_team_id_user_id_index": {
+          "name": "team_member_team_id_user_id_index",
+          "columns": [
+            {
+              "expression": "team_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "team_member_team_id_team_id_fk": {
+          "name": "team_member_team_id_team_id_fk",
+          "tableFrom": "team_member",
+          "tableTo": "team",
+          "columnsFrom": ["team_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "team_member_user_id_user_id_fk": {
+          "name": "team_member_user_id_user_id_fk",
+          "tableFrom": "team_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.job": {
+      "name": "job",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "job_agent_id": {
+          "name": "job_agent_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "job_agent_config": {
+          "name": "job_agent_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "external_run_id": {
+          "name": "external_run_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "job_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "message": {
+          "name": "message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "reason": {
+          "name": "reason",
+          "type": "job_reason",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'policy_passing'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "job_job_agent_id_job_agent_id_fk": {
+          "name": "job_job_agent_id_job_agent_id_fk",
+          "tableFrom": "job",
+          "tableTo": "job_agent",
+          "columnsFrom": ["job_agent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.job_variable": {
+      "name": "job_variable",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "job_id": {
+          "name": "job_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "job_variable_job_id_key_index": {
+          "name": "job_variable_job_id_key_index",
+          "columns": [
+            {
+              "expression": "job_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "job_variable_job_id_job_id_fk": {
+          "name": "job_variable_job_id_job_id_fk",
+          "tableFrom": "job_variable",
+          "tableTo": "job",
+          "columnsFrom": ["job_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.workspace": {
+      "name": "workspace",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "google_service_account_email": {
+          "name": "google_service_account_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "workspace_slug_unique": {
+          "name": "workspace_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": ["slug"]
+        }
+      }
+    },
+    "public.workspace_email_domain_matching": {
+      "name": "workspace_email_domain_matching",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "domain": {
+          "name": "domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role_id": {
+          "name": "role_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "verified": {
+          "name": "verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "verification_code": {
+          "name": "verification_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "verification_email": {
+          "name": "verification_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_email_domain_matching_workspace_id_domain_index": {
+          "name": "workspace_email_domain_matching_workspace_id_domain_index",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "domain",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_email_domain_matching_workspace_id_workspace_id_fk": {
+          "name": "workspace_email_domain_matching_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_email_domain_matching",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_email_domain_matching_role_id_role_id_fk": {
+          "name": "workspace_email_domain_matching_role_id_role_id_fk",
+          "tableFrom": "workspace_email_domain_matching",
+          "tableTo": "role",
+          "columnsFrom": ["role_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.variable_set": {
+      "name": "variable_set",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "system_id": {
+          "name": "system_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "variable_set_system_id_system_id_fk": {
+          "name": "variable_set_system_id_system_id_fk",
+          "tableFrom": "variable_set",
+          "tableTo": "system",
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.variable_set_value": {
+      "name": "variable_set_value",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "variable_set_id": {
+          "name": "variable_set_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "variable_set_value_variable_set_id_key_index": {
+          "name": "variable_set_value_variable_set_id_key_index",
+          "columns": [
+            {
+              "expression": "variable_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "variable_set_value_variable_set_id_variable_set_id_fk": {
+          "name": "variable_set_value_variable_set_id_variable_set_id_fk",
+          "tableFrom": "variable_set_value",
+          "tableTo": "variable_set",
+          "columnsFrom": ["variable_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.workspace_invite_token": {
+      "name": "workspace_invite_token",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "role_id": {
+          "name": "role_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workspace_invite_token_role_id_role_id_fk": {
+          "name": "workspace_invite_token_role_id_role_id_fk",
+          "tableFrom": "workspace_invite_token",
+          "tableTo": "role",
+          "columnsFrom": ["role_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_invite_token_workspace_id_workspace_id_fk": {
+          "name": "workspace_invite_token_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_invite_token",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_invite_token_created_by_user_id_fk": {
+          "name": "workspace_invite_token_created_by_user_id_fk",
+          "tableFrom": "workspace_invite_token",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "workspace_invite_token_token_unique": {
+          "name": "workspace_invite_token_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      }
+    },
+    "public.target_metadata_group": {
+      "name": "target_metadata_group",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "keys": {
+          "name": "keys",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "include_null_combinations": {
+          "name": "include_null_combinations",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "target_metadata_group_workspace_id_workspace_id_fk": {
+          "name": "target_metadata_group_workspace_id_workspace_id_fk",
+          "tableFrom": "target_metadata_group",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.runbook_variable": {
+      "name": "runbook_variable",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "runbook_id": {
+          "name": "runbook_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schema": {
+          "name": "schema",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "required": {
+          "name": "required",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {
+        "runbook_variable_runbook_id_key_index": {
+          "name": "runbook_variable_runbook_id_key_index",
+          "columns": [
+            {
+              "expression": "runbook_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "runbook_variable_runbook_id_runbook_id_fk": {
+          "name": "runbook_variable_runbook_id_runbook_id_fk",
+          "tableFrom": "runbook_variable",
+          "tableTo": "runbook",
+          "columnsFrom": ["runbook_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.entity_role": {
+      "name": "entity_role",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "role_id": {
+          "name": "role_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_type": {
+          "name": "entity_type",
+          "type": "entity_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_id": {
+          "name": "entity_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scope_id": {
+          "name": "scope_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scope_type": {
+          "name": "scope_type",
+          "type": "scope_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "entity_role_role_id_entity_type_entity_id_scope_id_scope_type_index": {
+          "name": "entity_role_role_id_entity_type_entity_id_scope_id_scope_type_index",
+          "columns": [
+            {
+              "expression": "role_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "scope_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "scope_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "entity_role_role_id_role_id_fk": {
+          "name": "entity_role_role_id_role_id_fk",
+          "tableFrom": "entity_role",
+          "tableTo": "role",
+          "columnsFrom": ["role_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.role": {
+      "name": "role",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "role_workspace_id_workspace_id_fk": {
+          "name": "role_workspace_id_workspace_id_fk",
+          "tableFrom": "role",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.role_permission": {
+      "name": "role_permission",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "role_id": {
+          "name": "role_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permission": {
+          "name": "permission",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "role_permission_role_id_permission_index": {
+          "name": "role_permission_role_id_permission_index",
+          "columns": [
+            {
+              "expression": "role_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "permission",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "role_permission_role_id_role_id_fk": {
+          "name": "role_permission_role_id_role_id_fk",
+          "tableFrom": "role_permission",
+          "tableTo": "role",
+          "columnsFrom": ["role_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.job_agent": {
+      "name": "job_agent",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        }
+      },
+      "indexes": {
+        "job_agent_workspace_id_name_index": {
+          "name": "job_agent_workspace_id_name_index",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "job_agent_workspace_id_workspace_id_fk": {
+          "name": "job_agent_workspace_id_workspace_id_fk",
+          "tableFrom": "job_agent",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {
+    "public.environment_policy_approval_requirement": {
+      "name": "environment_policy_approval_requirement",
+      "schema": "public",
+      "values": ["manual", "automatic"]
+    },
+    "public.approval_status_type": {
+      "name": "approval_status_type",
+      "schema": "public",
+      "values": ["pending", "approved", "rejected"]
+    },
+    "public.concurrency_type": {
+      "name": "concurrency_type",
+      "schema": "public",
+      "values": ["all", "some"]
+    },
+    "public.environment_policy_deployment_success_type": {
+      "name": "environment_policy_deployment_success_type",
+      "schema": "public",
+      "values": ["all", "some", "optional"]
+    },
+    "public.evaluation_type": {
+      "name": "evaluation_type",
+      "schema": "public",
+      "values": ["semver", "regex", "none"]
+    },
+    "public.recurrence_type": {
+      "name": "recurrence_type",
+      "schema": "public",
+      "values": ["hourly", "daily", "weekly", "monthly"]
+    },
+    "public.release_sequencing_type": {
+      "name": "release_sequencing_type",
+      "schema": "public",
+      "values": ["wait", "cancel"]
+    },
+    "public.release_dependency_rule_type": {
+      "name": "release_dependency_rule_type",
+      "schema": "public",
+      "values": ["regex", "semver"]
+    },
+    "public.release_job_trigger_type": {
+      "name": "release_job_trigger_type",
+      "schema": "public",
+      "values": [
+        "new_release",
+        "new_target",
+        "target_changed",
+        "api",
+        "redeploy",
+        "force_deploy"
+      ]
+    },
+    "public.job_reason": {
+      "name": "job_reason",
+      "schema": "public",
+      "values": [
+        "policy_passing",
+        "policy_override",
+        "env_policy_override",
+        "config_policy_override"
+      ]
+    },
+    "public.job_status": {
+      "name": "job_status",
+      "schema": "public",
+      "values": [
+        "completed",
+        "cancelled",
+        "skipped",
+        "in_progress",
+        "action_required",
+        "pending",
+        "failure",
+        "invalid_job_agent",
+        "invalid_integration",
+        "external_run_not_found"
+      ]
+    },
+    "public.entity_type": {
+      "name": "entity_type",
+      "schema": "public",
+      "values": ["user", "team"]
+    },
+    "public.scope_type": {
+      "name": "scope_type",
+      "schema": "public",
+      "values": [
+        "release",
+        "target",
+        "targetProvider",
+        "targetMetadataGroup",
+        "workspace",
+        "environment",
+        "environmentPolicy",
+        "deploymentVariable",
+        "variableSet",
+        "system",
+        "deployment",
+        "jobAgent",
+        "runbook"
+      ]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json
index c4a5bbe12..1556f3606 100644
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -29,6 +29,13 @@
       "when": 1727513481651,
       "tag": "0003_outstanding_punisher",
       "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "7",
+      "when": 1727634917358,
+      "tag": "0004_loving_dormammu",
+      "breakpoints": true
     }
   ]
 }
diff --git a/packages/db/src/schema/deployment-variables.ts b/packages/db/src/schema/deployment-variables.ts
index f9b183f66..6017c52dc 100644
--- a/packages/db/src/schema/deployment-variables.ts
+++ b/packages/db/src/schema/deployment-variables.ts
@@ -1,11 +1,23 @@
-import type { MetadataCondition } from "@ctrlplane/validators/targets";
+import type { TargetCondition } from "@ctrlplane/validators/targets";
+import type { VariableConfigType } from "@ctrlplane/validators/variables";
 import type { InferInsertModel, InferSelectModel } from "drizzle-orm";
-import { jsonb, pgTable, text, uniqueIndex, uuid } from "drizzle-orm/pg-core";
+import type { AnyPgColumn, ColumnsWithTable } from "drizzle-orm/pg-core";
+import { sql } from "drizzle-orm";
+import {
+  foreignKey,
+  jsonb,
+  pgTable,
+  text,
+  uniqueIndex,
+  uuid,
+} from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { z } from "zod";
 
+import { targetCondition } from "@ctrlplane/validators/targets";
+import { VariableConfig } from "@ctrlplane/validators/variables";
+
 import { deployment } from "./deployment.js";
-import { target } from "./target.js";
 import { variableSet } from "./variable-sets.js";
 
 export const deploymentVariable = pgTable(
@@ -17,14 +29,24 @@ export const deploymentVariable = pgTable(
     deploymentId: uuid("deployment_id")
       .notNull()
       .references(() => deployment.id),
-    schema: jsonb("schema").$type<Record<string, any>>(),
+    defaultValueId: uuid("default_value_id").default(sql`NULL`),
+    config: jsonb("schema").$type<VariableConfigType>(),
   },
-  (t) => ({ uniq: uniqueIndex().on(t.deploymentId, t.key) }),
+  (t) => ({
+    uniq: uniqueIndex().on(t.deploymentId, t.key),
+    defaultValueIdFK: foreignKey(defaultValueIdFKConstraint).onDelete(
+      "set null",
+    ),
+  }),
 );
 
 export type DeploymentVariable = InferSelectModel<typeof deploymentVariable>;
+export type InsertDeploymentVariable = InferInsertModel<
+  typeof deploymentVariable
+>;
 export const createDeploymentVariable = createInsertSchema(deploymentVariable, {
-  schema: z.record(z.any()).optional(),
+  key: z.string().min(1),
+  config: VariableConfig,
 }).omit({ id: true });
 export const updateDeploymentVariable = createDeploymentVariable.partial();
 
@@ -32,64 +54,50 @@ export const deploymentVariableValue = pgTable(
   "deployment_variable_value",
   {
     id: uuid("id").notNull().primaryKey().defaultRandom(),
-    variableId: uuid("variable_id")
-      .notNull()
-      .references(() => deploymentVariable.id, { onDelete: "cascade" }),
+    variableId: uuid("variable_id").notNull(),
     value: jsonb("value").$type<any>().notNull(),
+    targetFilter: jsonb("target_filter")
+      .$type<TargetCondition | null>()
+      .default(sql`NULL`),
   },
-  (t) => ({ uniq: uniqueIndex().on(t.variableId, t.value) }),
+  (t) => ({
+    uniq: uniqueIndex().on(t.variableId, t.value),
+    variableIdFk: foreignKey({
+      columns: [t.variableId],
+      foreignColumns: [deploymentVariable.id],
+    })
+      .onUpdate("restrict")
+      .onDelete("cascade"),
+  }),
 );
-export type DeploymentVariableValue = InferInsertModel<
+export type DeploymentVariableValue = InferSelectModel<
   typeof deploymentVariableValue
 >;
 export const createDeploymentVariableValue = createInsertSchema(
   deploymentVariableValue,
-).omit({
-  id: true,
-});
+  { targetFilter: targetCondition },
+)
+  .omit({
+    id: true,
+  })
+  .extend({
+    default: z.boolean().optional(),
+  });
 export const updateDeploymentVariableValue =
   createDeploymentVariableValue.partial();
 
-export const deploymentVariableValueTargetFilter = pgTable(
-  "deployment_variable_value_target_filter",
-  {
-    id: uuid("id").notNull().primaryKey().defaultRandom(),
-    variableValueId: uuid("variable_value_id")
-      .notNull()
-      .references(() => deploymentVariableValue.id, { onDelete: "cascade" }),
-    targetFilter: jsonb("target_filter").$type<MetadataCondition>().notNull(),
-  },
-);
-export type DeploymentVariableValueTargetFilter = InferInsertModel<
-  typeof deploymentVariableValueTargetFilter
->;
-export const createDeploymentVariableValueTargetFilter = createInsertSchema(
-  deploymentVariableValueTargetFilter,
-).omit({ id: true });
-export const updateDeploymentVariableValueTargetFilter =
-  createDeploymentVariableValueTargetFilter.partial();
-
-export const deploymentVariableValueTarget = pgTable(
-  "deployment_variable_value_target",
-  {
-    id: uuid("id").notNull().primaryKey().defaultRandom(),
-    variableValueId: uuid("variable_value_id")
-      .notNull()
-      .references(() => deploymentVariableValue.id, { onDelete: "cascade" }),
-    targetId: uuid("target_id")
-      .notNull()
-      .references(() => target.id, { onDelete: "cascade" }),
-  },
-  (t) => ({ uniq: uniqueIndex().on(t.variableValueId, t.targetId) }),
-);
-export type DeploymentVariableValueTarget = InferInsertModel<
-  typeof deploymentVariableValueTarget
->;
-export const createDeploymentVariableValueTarget = createInsertSchema(
-  deploymentVariableValueTarget,
-).omit({ id: true });
-export const updateDeploymentVariableValueTarget =
-  createDeploymentVariableValueTarget.partial();
+// workaround for cirular reference - https://www.answeroverflow.com/m/1194395880523042936
+const defaultValueIdFKConstraint: {
+  columns: [AnyPgColumn<{ tableName: "deployment_variable" }>];
+  foreignColumns: ColumnsWithTable<
+    "deployment_variable",
+    "deployment_variable_value",
+    [AnyPgColumn<{ tableName: "deployment_variable" }>]
+  >;
+} = {
+  columns: [deploymentVariable.defaultValueId],
+  foreignColumns: [deploymentVariableValue.id],
+};
 
 export const deploymentVariableSet = pgTable(
   "deployment_variable_set",
diff --git a/packages/db/src/schema/rbac.ts b/packages/db/src/schema/rbac.ts
index 9822a5841..c5814063f 100644
--- a/packages/db/src/schema/rbac.ts
+++ b/packages/db/src/schema/rbac.ts
@@ -40,6 +40,7 @@ export const scopeType = pgEnum("scope_type", [
   "workspace",
   "environment",
   "environmentPolicy",
+  "deploymentVariable",
   "variableSet",
   "system",
   "deployment",
diff --git a/packages/db/src/schema/target.ts b/packages/db/src/schema/target.ts
index b62c96218..1e6726b44 100644
--- a/packages/db/src/schema/target.ts
+++ b/packages/db/src/schema/target.ts
@@ -154,6 +154,8 @@ const buildCondition = (tx: Tx, cond: TargetCondition): SQL => {
 
   if (cond.type === "name") return like(target.name, cond.value);
 
+  if (cond.conditions.length === 0) return sql`FALSE`;
+
   const subCon = cond.conditions.map((c) => buildCondition(tx, c));
   const con = cond.operator === "and" ? and(...subCon)! : or(...subCon)!;
   return cond.not ? not(con) : con;
diff --git a/packages/job-dispatch/src/job-creation.ts b/packages/job-dispatch/src/job-creation.ts
index 3dc162f83..83eb8971a 100644
--- a/packages/job-dispatch/src/job-creation.ts
+++ b/packages/job-dispatch/src/job-creation.ts
@@ -1,7 +1,7 @@
 import type { Tx } from "@ctrlplane/db";
 import _ from "lodash";
 
-import { and, eq, inArray, isNotNull, or, takeFirst } from "@ctrlplane/db";
+import { and, eq, isNotNull, or, takeFirst } from "@ctrlplane/db";
 import { db } from "@ctrlplane/db/client";
 import * as schema from "@ctrlplane/db/schema";
 // import {
@@ -72,81 +72,6 @@ export const createTriggeredRunbookJob = async (
   return job;
 };
 
-export const createTriggeredReleaseJobs = async (
-  db: Tx,
-  releaseJobTriggers: schema.ReleaseJobTrigger[],
-  status: schema.JobStatus = JobStatus.Pending,
-): Promise<schema.Job[]> => {
-  logger.info(`Creating triggered release jobs`, {
-    releaseJobTriggersCount: releaseJobTriggers.length,
-    status,
-  });
-
-  const insertJobs = await db
-    .select()
-    .from(schema.releaseJobTrigger)
-    .leftJoin(
-      schema.release,
-      eq(schema.release.id, schema.releaseJobTrigger.releaseId),
-    )
-    .leftJoin(
-      schema.deployment,
-      eq(schema.deployment.id, schema.release.deploymentId),
-    )
-    .innerJoin(
-      schema.jobAgent,
-      eq(schema.jobAgent.id, schema.deployment.jobAgentId),
-    )
-    .where(
-      inArray(
-        schema.releaseJobTrigger.id,
-        releaseJobTriggers.map((t) => t.id),
-      ),
-    );
-
-  logger.debug(`Found jobs to insert`, { count: insertJobs.length });
-
-  if (insertJobs.length === 0) {
-    logger.info(`No jobs to insert, returning empty array`);
-    return [];
-  }
-
-  const jobs = await db
-    .insert(schema.job)
-    .values(
-      insertJobs.map((d) => ({
-        jobAgentId: d.job_agent.id,
-        jobAgentConfig: _.merge(
-          d.job_agent.config,
-          d.deployment?.jobAgentConfig ?? {},
-        ),
-        status,
-      })),
-    )
-    .returning();
-
-  logger.info(`Inserted jobs`, { count: jobs.length });
-
-  // Update releaseJobTrigger with the new job ids
-  await Promise.all(
-    jobs.map((job, index) =>
-      db
-        .update(schema.releaseJobTrigger)
-        .set({ jobId: job.id })
-        .where(
-          eq(
-            schema.releaseJobTrigger.id,
-            insertJobs[index]!.release_job_trigger.id,
-          ),
-        ),
-    ),
-  );
-
-  logger.info(`Updated releaseJobTrigger with new job ids`);
-
-  return jobs;
-};
-
 /**
  * When a job completes, there may be other jobs that should now be triggered
  * because the completion of this job means that some policies are now passing.
diff --git a/packages/job-dispatch/src/job-variables-deployment.ts b/packages/job-dispatch/src/job-variables-deployment.ts
index cd5ccd78b..70ce86a6b 100644
--- a/packages/job-dispatch/src/job-variables-deployment.ts
+++ b/packages/job-dispatch/src/job-variables-deployment.ts
@@ -1,6 +1,7 @@
 import type { Tx } from "@ctrlplane/db";
+import { isPresent } from "ts-is-present";
 
-import { and, eq, takeFirst, takeFirstOrNull } from "@ctrlplane/db";
+import { and, eq, takeFirstOrNull } from "@ctrlplane/db";
 import * as schema from "@ctrlplane/db/schema";
 
 export const createReleaseVariables = async (
@@ -59,13 +60,16 @@ const determineVariablesForReleaseJob = async (
       determineReleaseVariableValue(
         tx,
         variable.deployment_variable.id,
+        variable.deployment_variable.defaultValueId,
         jobTarget,
-      ).then((value) =>
-        jobVariables.push({
-          jobId: job.id,
-          key: variable.deployment_variable.key,
-          value: value.value,
-        }),
+      ).then(
+        (value) =>
+          value != null &&
+          jobVariables.push({
+            jobId: job.id,
+            key: variable.deployment_variable.key,
+            value: value.value,
+          }),
       ),
     ),
   );
@@ -76,67 +80,44 @@ const determineVariablesForReleaseJob = async (
 const determineReleaseVariableValue = async (
   tx: Tx,
   variableId: string,
+  defaultValueId: string | null,
   jobTarget: schema.Target,
-): Promise<schema.DeploymentVariableValue> => {
-  // Check for a direct target match
-  const directMatch = await tx
+): Promise<schema.DeploymentVariableValue | null> => {
+  const deploymentVariableValues = await tx
     .select()
     .from(schema.deploymentVariableValue)
-    .innerJoin(
-      schema.deploymentVariableValueTarget,
-      eq(
-        schema.deploymentVariableValueTarget.variableValueId,
-        schema.deploymentVariableValue.id,
-      ),
-    )
-    .where(
-      and(
-        eq(schema.deploymentVariableValue.variableId, variableId),
-        eq(schema.deploymentVariableValueTarget.targetId, jobTarget.id),
-      ),
-    )
-    .then(takeFirstOrNull);
+    .orderBy(schema.deploymentVariableValue.value)
+    .where(eq(schema.deploymentVariableValue.variableId, variableId));
 
-  if (directMatch != null) return directMatch.deployment_variable_value;
+  if (deploymentVariableValues.length === 0) return null;
 
-  // Check for a match based on target filters
-  const deploymentVariableValue = await tx
-    .select()
-    .from(schema.deploymentVariableValue)
-    .innerJoin(
-      schema.deploymentVariableValueTargetFilter,
-      eq(
-        schema.deploymentVariableValueTargetFilter.variableValueId,
-        schema.deploymentVariableValue.id,
-      ),
-    )
-    .where(eq(schema.deploymentVariableValue.variableId, variableId))
-    .then(takeFirstOrNull);
+  const defaultValue = deploymentVariableValues.find(
+    (v) => v.id === defaultValueId,
+  );
+  const valuesWithFilters = deploymentVariableValues.filter(
+    (v) => v.targetFilter != null,
+  );
 
-  if (deploymentVariableValue != null) {
-    const filterMatch = await tx
-      .select()
-      .from(schema.target)
-      .where(
-        schema.targetMatchesMetadata(
-          tx,
-          deploymentVariableValue.deployment_variable_value_target_filter
-            .targetFilter,
-        ),
-      )
-      .limit(1)
-      .then(takeFirstOrNull);
-
-    if (filterMatch != null)
-      return deploymentVariableValue.deployment_variable_value;
-  }
-
-  // If no specific match is found, return the default value (if any)
-  const defaultValue = await tx
-    .select()
-    .from(schema.deploymentVariableValue)
-    .where(eq(schema.deploymentVariableValue.variableId, variableId))
-    .then(takeFirst);
+  const valuesMatchedByFilter = await Promise.all(
+    valuesWithFilters.map(async (value) => {
+      const matchedTarget = await tx
+        .select()
+        .from(schema.target)
+        .where(
+          and(
+            eq(schema.target.id, jobTarget.id),
+            schema.targetMatchesMetadata(tx, value.targetFilter),
+          ),
+        )
+        .then(takeFirstOrNull);
+
+      if (matchedTarget != null) return value;
+    }),
+  ).then((values) => values.filter(isPresent));
+
+  if (valuesMatchedByFilter.length > 0) return valuesMatchedByFilter[0]!;
+
+  if (defaultValue != null) return defaultValue;
 
-  return defaultValue;
+  return deploymentVariableValues[0]!;
 };
diff --git a/packages/job-dispatch/src/release-job-trigger.ts b/packages/job-dispatch/src/release-job-trigger.ts
index f75ee4073..1929f9b37 100644
--- a/packages/job-dispatch/src/release-job-trigger.ts
+++ b/packages/job-dispatch/src/release-job-trigger.ts
@@ -20,6 +20,8 @@ import {
   targetMatchesMetadata,
 } from "@ctrlplane/db/schema";
 
+import { createReleaseVariables } from "./job-variables-deployment.js";
+
 type FilterFunc = (
   tx: Tx,
   insertReleaseJobTriggers: ReleaseJobTriggerInsert[],
@@ -207,6 +209,10 @@ class ReleaseJobTriggerBuilder {
       .values(wtWithJobId)
       .returning();
 
+    await Promise.all(
+      jobs.map((job) => createReleaseVariables(this.tx, job.id)),
+    );
+
     for (const func of this._then) await func(this.tx, releaseJobTriggers);
 
     return releaseJobTriggers;
diff --git a/packages/validators/src/auth/index.ts b/packages/validators/src/auth/index.ts
index 96de80b14..81d806c33 100644
--- a/packages/validators/src/auth/index.ts
+++ b/packages/validators/src/auth/index.ts
@@ -44,6 +44,10 @@ export enum Permission {
   DeploymentDelete = "deployment.delete",
   DeploymentList = "deployment.list",
 
+  DeploymentVariableCreate = "deploymentVariable.create",
+  DeploymentVariableUpdate = "deploymentVariable.update",
+  DeploymentVariableDelete = "deploymentVariable.delete",
+
   ReleaseCreate = "release.create",
   ReleaseGet = "release.get",
   ReleaseList = "release.list",
diff --git a/packages/validators/src/variables/index.ts b/packages/validators/src/variables/index.ts
index abd38f812..f96723231 100644
--- a/packages/validators/src/variables/index.ts
+++ b/packages/validators/src/variables/index.ts
@@ -22,7 +22,7 @@ export const NumberVariableConfig = z.object({
   maximum: z.number().optional(),
   default: z.number().optional(),
 });
-export type NumberSchemaConfigType = z.infer<typeof NumberVariableConfig>;
+export type NumberVariableConfigType = z.infer<typeof NumberVariableConfig>;
 
 export const BooleanVariableConfig = z.object({
   type: z.literal("boolean"),