diff --git a/apps/event-worker/src/job-dispatch/github.ts b/apps/event-worker/src/job-dispatch/github.ts
index 5560dbf0c..c2dd73a07 100644
--- a/apps/event-worker/src/job-dispatch/github.ts
+++ b/apps/event-worker/src/job-dispatch/github.ts
@@ -85,7 +85,7 @@ const getReleaseJobAgentConfig = (jobId: string) =>
     .from(SCHEMA.deploymentVersion)
     .innerJoin(
       SCHEMA.releaseJobTrigger,
-      eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
+      eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
     )
     .where(eq(SCHEMA.releaseJobTrigger.jobId, jobId))
     .then(takeFirstOrNull)
diff --git a/apps/jobs/src/policy-checker/index.ts b/apps/jobs/src/policy-checker/index.ts
index 4900d9251..115dd35a0 100644
--- a/apps/jobs/src/policy-checker/index.ts
+++ b/apps/jobs/src/policy-checker/index.ts
@@ -42,7 +42,7 @@ export const run = async () => {
         ),
         eq(
           schema.environmentPolicyApproval.releaseId,
-          schema.releaseJobTrigger.releaseId,
+          schema.releaseJobTrigger.versionId,
         ),
       ),
     )
diff --git a/apps/jobs/src/timeout-checker/index.ts b/apps/jobs/src/timeout-checker/index.ts
index 329acf9f0..964aab6d5 100644
--- a/apps/jobs/src/timeout-checker/index.ts
+++ b/apps/jobs/src/timeout-checker/index.ts
@@ -14,7 +14,7 @@ export const run = async () =>
     )
     .innerJoin(
       SCHEMA.releaseJobTrigger,
-      eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
+      eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
     )
     .innerJoin(SCHEMA.job, eq(SCHEMA.releaseJobTrigger.jobId, SCHEMA.job.id))
     .where(
diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/ReleaseCell.tsx b/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/ReleaseCell.tsx
index 8869f55e6..17244fa95 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/ReleaseCell.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/ReleaseCell.tsx
@@ -83,7 +83,7 @@ export const ReleaseCell: React.FC<{
   const params = useParams<{ workspaceSlug: string; systemSlug: string }>();
   return (
     <Link
-      href={`/${params.workspaceSlug}/systems/${params.systemSlug}/deployments/${deployment.slug}/releases/${releaseJobTrigger.releaseId}`}
+      href={`/${params.workspaceSlug}/systems/${params.systemSlug}/deployments/${deployment.slug}/releases/${releaseJobTrigger.versionId}`}
       className="flex items-center gap-2"
     >
       <ReleaseIcon job={releaseJobTrigger.job} />
diff --git a/apps/webservice/src/app/api/v1/job-agents/[agentId]/jobs/running/route.ts b/apps/webservice/src/app/api/v1/job-agents/[agentId]/jobs/running/route.ts
index 2d696ed7f..953504a6a 100644
--- a/apps/webservice/src/app/api/v1/job-agents/[agentId]/jobs/running/route.ts
+++ b/apps/webservice/src/app/api/v1/job-agents/[agentId]/jobs/running/route.ts
@@ -36,7 +36,7 @@ export const GET = async (
     )
     .leftJoin(
       SCHEMA.deploymentVersion,
-      eq(SCHEMA.deploymentVersion.id, SCHEMA.releaseJobTrigger.releaseId),
+      eq(SCHEMA.deploymentVersion.id, SCHEMA.releaseJobTrigger.versionId),
     )
     .leftJoin(
       SCHEMA.releaseMetadata,
diff --git a/apps/webservice/src/app/api/v1/jobs/[jobId]/route.ts b/apps/webservice/src/app/api/v1/jobs/[jobId]/route.ts
index 5cde6a727..f2fc16043 100644
--- a/apps/webservice/src/app/api/v1/jobs/[jobId]/route.ts
+++ b/apps/webservice/src/app/api/v1/jobs/[jobId]/route.ts
@@ -83,7 +83,7 @@ export const GET = request()
       )
       .leftJoin(
         schema.deploymentVersion,
-        eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+        eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
       )
       .leftJoin(
         schema.deployment,
diff --git a/packages/api/src/router/deployment-stats.ts b/packages/api/src/router/deployment-stats.ts
index 17c77cc6f..58ffdcd73 100644
--- a/packages/api/src/router/deployment-stats.ts
+++ b/packages/api/src/router/deployment-stats.ts
@@ -189,7 +189,7 @@ export const deploymentStatsRouter = createTRPCRouter({
         )
         .leftJoin(
           schema.releaseJobTrigger,
-          eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+          eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
         )
         .leftJoin(schema.job, eq(schema.job.id, schema.releaseJobTrigger.jobId))
         .innerJoin(
@@ -243,7 +243,7 @@ export const deploymentStatsRouter = createTRPCRouter({
         )
         .innerJoin(
           schema.deploymentVersion,
-          eq(schema.deploymentVersion.id, schema.releaseJobTrigger.releaseId),
+          eq(schema.deploymentVersion.id, schema.releaseJobTrigger.versionId),
         )
         .innerJoin(
           schema.deployment,
@@ -298,7 +298,7 @@ export const deploymentStatsRouter = createTRPCRouter({
         )
         .innerJoin(
           schema.deploymentVersion,
-          eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+          eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
         )
         .where(
           and(
diff --git a/packages/api/src/router/deployment-version.ts b/packages/api/src/router/deployment-version.ts
index 56a502874..18fb12c09 100644
--- a/packages/api/src/router/deployment-version.ts
+++ b/packages/api/src/router/deployment-version.ts
@@ -376,7 +376,7 @@ export const versionRouter = createTRPCRouter({
           )
           .where(
             and(
-              eq(SCHEMA.releaseJobTrigger.releaseId, releaseId),
+              eq(SCHEMA.releaseJobTrigger.versionId, releaseId),
               eq(SCHEMA.releaseJobTrigger.environmentId, environmentId),
               isNull(SCHEMA.resource.deletedAt),
             ),
@@ -440,7 +440,7 @@ export const versionRouter = createTRPCRouter({
           )
           .innerJoin(
             SCHEMA.deploymentVersion,
-            eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
+            eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
           )
           .orderBy(
             SCHEMA.releaseJobTrigger.resourceId,
@@ -487,7 +487,7 @@ export const versionRouter = createTRPCRouter({
                   .where(
                     and(
                       eq(
-                        SCHEMA.releaseJobTrigger.releaseId,
+                        SCHEMA.releaseJobTrigger.versionId,
                         SCHEMA.deploymentVersion.id,
                       ),
                       eq(SCHEMA.releaseJobTrigger.environmentId, environmentId),
@@ -511,7 +511,7 @@ export const versionRouter = createTRPCRouter({
                   .where(
                     and(
                       eq(
-                        SCHEMA.releaseJobTrigger.releaseId,
+                        SCHEMA.releaseJobTrigger.versionId,
                         SCHEMA.deploymentVersion.id,
                       ),
                       eq(SCHEMA.releaseJobTrigger.environmentId, environmentId),
diff --git a/packages/api/src/router/deployment.ts b/packages/api/src/router/deployment.ts
index 8da021e0b..6f110ec85 100644
--- a/packages/api/src/router/deployment.ts
+++ b/packages/api/src/router/deployment.ts
@@ -383,7 +383,7 @@ export const deploymentRouter = createTRPCRouter({
         )
         .innerJoin(
           SCHEMA.deploymentVersion,
-          eq(SCHEMA.deploymentVersion.id, SCHEMA.releaseJobTrigger.releaseId),
+          eq(SCHEMA.deploymentVersion.id, SCHEMA.releaseJobTrigger.versionId),
         )
         .innerJoin(
           SCHEMA.resource,
@@ -652,7 +652,7 @@ export const deploymentRouter = createTRPCRouter({
               and(
                 eq(SCHEMA.releaseJobTrigger.resourceId, SCHEMA.resource.id),
                 eq(
-                  SCHEMA.releaseJobTrigger.releaseId,
+                  SCHEMA.releaseJobTrigger.versionId,
                   SCHEMA.deploymentVersion.id,
                 ),
                 eq(
diff --git a/packages/api/src/router/environment-approval.ts b/packages/api/src/router/environment-approval.ts
index 2d5159260..8beed307a 100644
--- a/packages/api/src/router/environment-approval.ts
+++ b/packages/api/src/router/environment-approval.ts
@@ -107,7 +107,7 @@ export const approvalRouter = createTRPCRouter({
         )
         .innerJoin(
           SCHEMA.deploymentVersion,
-          eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
+          eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
         )
         .where(
           and(
diff --git a/packages/api/src/router/environment-stats.ts b/packages/api/src/router/environment-stats.ts
index 1c58e550f..6ae69538a 100644
--- a/packages/api/src/router/environment-stats.ts
+++ b/packages/api/src/router/environment-stats.ts
@@ -51,7 +51,7 @@ export const environmentStatsRouter = createTRPCRouter({
         )
         .innerJoin(
           SCHEMA.deploymentVersion,
-          eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
+          eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
         )
         .innerJoin(
           SCHEMA.deployment,
diff --git a/packages/api/src/router/job.ts b/packages/api/src/router/job.ts
index 1e190686d..e702a18b1 100644
--- a/packages/api/src/router/job.ts
+++ b/packages/api/src/router/job.ts
@@ -47,7 +47,7 @@ const releaseJobTriggerQuery = (tx: Tx) =>
     )
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.deployment,
@@ -230,7 +230,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
           )
           .innerJoin(
             schema.deploymentVersion,
-            eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+            eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
           )
           .innerJoin(
             schema.deployment,
@@ -350,7 +350,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
           )
           .innerJoin(
             schema.deploymentVersion,
-            eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+            eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
           )
           .where(
             and(
@@ -457,7 +457,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
         )
         .where(
           and(
-            eq(schema.releaseJobTrigger.releaseId, input.releaseId),
+            eq(schema.releaseJobTrigger.versionId, input.releaseId),
             eq(schema.releaseJobTrigger.environmentId, input.environmentId),
           ),
         )
@@ -782,7 +782,7 @@ const metadataKeysRouter = createTRPCRouter({
         .from(schema.deploymentVersion)
         .innerJoin(
           schema.releaseJobTrigger,
-          eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+          eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
         )
         .innerJoin(
           schema.job,
diff --git a/packages/api/src/router/resource-stats.ts b/packages/api/src/router/resource-stats.ts
index 87fa7d69c..9a496c70f 100644
--- a/packages/api/src/router/resource-stats.ts
+++ b/packages/api/src/router/resource-stats.ts
@@ -80,7 +80,7 @@ const healthRouter = createTRPCRouter({
         .from(SCHEMA.deploymentVersion)
         .innerJoin(
           SCHEMA.releaseJobTrigger,
-          eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
+          eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
         )
         .innerJoin(
           SCHEMA.job,
diff --git a/packages/api/src/router/resources.ts b/packages/api/src/router/resources.ts
index 314e1d676..21f6630f0 100644
--- a/packages/api/src/router/resources.ts
+++ b/packages/api/src/router/resources.ts
@@ -104,7 +104,7 @@ const latestActiveReleaseByResourceAndEnvironmentId = (
     .from(schema.deploymentVersion)
     .innerJoin(
       schema.releaseJobTrigger,
-      eq(schema.deploymentVersion.id, schema.releaseJobTrigger.releaseId),
+      eq(schema.deploymentVersion.id, schema.releaseJobTrigger.versionId),
     )
     .as("rank_subquery");
 
@@ -123,7 +123,7 @@ const latestActiveReleaseByResourceAndEnvironmentId = (
     .innerJoin(
       schema.releaseJobTrigger,
       and(
-        eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+        eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
         eq(schema.releaseJobTrigger.environmentId, schema.environment.id),
       ),
     )
diff --git a/packages/auth/src/utils/rbac.ts b/packages/auth/src/utils/rbac.ts
index 093418413..43c3ef0d5 100644
--- a/packages/auth/src/utils/rbac.ts
+++ b/packages/auth/src/utils/rbac.ts
@@ -358,7 +358,7 @@ const getJobScopes = async (id: string) => {
     .innerJoin(environment, eq(releaseJobTrigger.environmentId, environment.id))
     .innerJoin(
       deploymentVersion,
-      eq(releaseJobTrigger.releaseId, deploymentVersion.id),
+      eq(releaseJobTrigger.versionId, deploymentVersion.id),
     )
     .innerJoin(deployment, eq(deploymentVersion.deploymentId, deployment.id))
     .innerJoin(system, eq(deployment.systemId, system.id))
diff --git a/packages/db/drizzle/meta/0076_snapshot.json b/packages/db/drizzle/meta/0076_snapshot.json
index 45cfff3fe..4fce46d28 100644
--- a/packages/db/drizzle/meta/0076_snapshot.json
+++ b/packages/db/drizzle/meta/0076_snapshot.json
@@ -81,12 +81,8 @@
           "name": "account_userId_user_id_fk",
           "tableFrom": "account",
           "tableTo": "user",
-          "columnsFrom": [
-            "userId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["userId"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +90,7 @@
       "compositePrimaryKeys": {
         "account_provider_providerAccountId_pk": {
           "name": "account_provider_providerAccountId_pk",
-          "columns": [
-            "provider",
-            "providerAccountId"
-          ]
+          "columns": ["provider", "providerAccountId"]
         }
       },
       "uniqueConstraints": {}
@@ -131,12 +124,8 @@
           "name": "session_userId_user_id_fk",
           "tableFrom": "session",
           "tableTo": "user",
-          "columnsFrom": [
-            "userId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["userId"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -215,12 +204,8 @@
           "name": "user_active_workspace_id_workspace_id_fk",
           "tableFrom": "user",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "active_workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["active_workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -304,12 +289,8 @@
           "name": "user_api_key_user_id_user_id_fk",
           "tableFrom": "user_api_key",
           "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -366,12 +347,8 @@
           "name": "dashboard_workspace_id_workspace_id_fk",
           "tableFrom": "dashboard",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -440,12 +417,8 @@
           "name": "dashboard_widget_dashboard_id_dashboard_id_fk",
           "tableFrom": "dashboard_widget",
           "tableTo": "dashboard",
-          "columnsFrom": [
-            "dashboard_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["dashboard_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -525,12 +498,8 @@
           "name": "deployment_variable_deployment_id_deployment_id_fk",
           "tableFrom": "deployment_variable",
           "tableTo": "deployment",
-          "columnsFrom": [
-            "deployment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -538,12 +507,8 @@
           "name": "deployment_variable_default_value_id_deployment_variable_value_id_fk",
           "tableFrom": "deployment_variable",
           "tableTo": "deployment_variable_value",
-          "columnsFrom": [
-            "default_value_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["default_value_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -603,12 +568,8 @@
           "name": "deployment_variable_set_deployment_id_deployment_id_fk",
           "tableFrom": "deployment_variable_set",
           "tableTo": "deployment",
-          "columnsFrom": [
-            "deployment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -616,12 +577,8 @@
           "name": "deployment_variable_set_variable_set_id_variable_set_id_fk",
           "tableFrom": "deployment_variable_set",
           "tableTo": "variable_set",
-          "columnsFrom": [
-            "variable_set_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["variable_set_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -688,12 +645,8 @@
           "name": "deployment_variable_value_variable_id_deployment_variable_id_fk",
           "tableFrom": "deployment_variable_value",
           "tableTo": "deployment_variable",
-          "columnsFrom": [
-            "variable_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["variable_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "restrict"
         }
@@ -799,12 +752,8 @@
           "name": "deployment_system_id_system_id_fk",
           "tableFrom": "deployment",
           "tableTo": "system",
-          "columnsFrom": [
-            "system_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         },
@@ -812,12 +761,8 @@
           "name": "deployment_job_agent_id_job_agent_id_fk",
           "tableFrom": "deployment",
           "tableTo": "job_agent",
-          "columnsFrom": [
-            "job_agent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["job_agent_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -876,12 +821,8 @@
           "name": "deployment_meta_dependency_deployment_id_deployment_id_fk",
           "tableFrom": "deployment_meta_dependency",
           "tableTo": "deployment",
-          "columnsFrom": [
-            "deployment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         },
@@ -889,12 +830,8 @@
           "name": "deployment_meta_dependency_depends_on_id_deployment_id_fk",
           "tableFrom": "deployment_meta_dependency",
           "tableTo": "deployment",
-          "columnsFrom": [
-            "depends_on_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["depends_on_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -954,12 +891,8 @@
           "name": "environment_policy_deployment_policy_id_environment_policy_id_fk",
           "tableFrom": "environment_policy_deployment",
           "tableTo": "environment_policy",
-          "columnsFrom": [
-            "policy_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["policy_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -967,12 +900,8 @@
           "name": "environment_policy_deployment_environment_id_environment_id_fk",
           "tableFrom": "environment_policy_deployment",
           "tableTo": "environment",
-          "columnsFrom": [
-            "environment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["environment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1066,12 +995,8 @@
           "name": "environment_system_id_system_id_fk",
           "tableFrom": "environment",
           "tableTo": "system",
-          "columnsFrom": [
-            "system_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1079,12 +1004,8 @@
           "name": "environment_policy_id_environment_policy_id_fk",
           "tableFrom": "environment",
           "tableTo": "environment_policy",
-          "columnsFrom": [
-            "policy_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["policy_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1150,12 +1071,8 @@
           "name": "environment_metadata_environment_id_environment_id_fk",
           "tableFrom": "environment_metadata",
           "tableTo": "environment",
-          "columnsFrom": [
-            "environment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["environment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1257,12 +1174,8 @@
           "name": "environment_policy_system_id_system_id_fk",
           "tableFrom": "environment_policy",
           "tableTo": "system",
-          "columnsFrom": [
-            "system_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1270,12 +1183,8 @@
           "name": "environment_policy_environment_id_environment_id_fk",
           "tableFrom": "environment_policy",
           "tableTo": "environment",
-          "columnsFrom": [
-            "environment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["environment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1356,12 +1265,8 @@
           "name": "environment_policy_approval_policy_id_environment_policy_id_fk",
           "tableFrom": "environment_policy_approval",
           "tableTo": "environment_policy",
-          "columnsFrom": [
-            "policy_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["policy_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1369,12 +1274,8 @@
           "name": "environment_policy_approval_release_id_deployment_version_id_fk",
           "tableFrom": "environment_policy_approval",
           "tableTo": "deployment_version",
-          "columnsFrom": [
-            "release_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["release_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1382,12 +1283,8 @@
           "name": "environment_policy_approval_user_id_user_id_fk",
           "tableFrom": "environment_policy_approval",
           "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1438,12 +1335,8 @@
           "name": "environment_policy_release_window_policy_id_environment_policy_id_fk",
           "tableFrom": "environment_policy_release_window",
           "tableTo": "environment_policy",
-          "columnsFrom": [
-            "policy_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["policy_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1580,12 +1473,8 @@
           "name": "runhook_hook_id_hook_id_fk",
           "tableFrom": "runhook",
           "tableTo": "hook",
-          "columnsFrom": [
-            "hook_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["hook_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1593,12 +1482,8 @@
           "name": "runhook_runbook_id_runbook_id_fk",
           "tableFrom": "runhook",
           "tableTo": "runbook",
-          "columnsFrom": [
-            "runbook_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["runbook_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1691,12 +1576,8 @@
           "name": "github_entity_added_by_user_id_user_id_fk",
           "tableFrom": "github_entity",
           "tableTo": "user",
-          "columnsFrom": [
-            "added_by_user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["added_by_user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1704,12 +1585,8 @@
           "name": "github_entity_workspace_id_workspace_id_fk",
           "tableFrom": "github_entity",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1753,12 +1630,8 @@
           "name": "github_user_user_id_user_id_fk",
           "tableFrom": "github_user",
           "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1818,12 +1691,8 @@
           "name": "job_resource_relationship_job_id_job_id_fk",
           "tableFrom": "job_resource_relationship",
           "tableTo": "job",
-          "columnsFrom": [
-            "job_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["job_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1939,12 +1808,8 @@
           "name": "resource_provider_id_resource_provider_id_fk",
           "tableFrom": "resource",
           "tableTo": "resource_provider",
-          "columnsFrom": [
-            "provider_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["provider_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         },
@@ -1952,12 +1817,8 @@
           "name": "resource_workspace_id_workspace_id_fk",
           "tableFrom": "resource",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2023,12 +1884,8 @@
           "name": "resource_metadata_resource_id_resource_id_fk",
           "tableFrom": "resource_metadata",
           "tableTo": "resource",
-          "columnsFrom": [
-            "resource_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["resource_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2101,12 +1958,8 @@
           "name": "resource_relationship_workspace_id_workspace_id_fk",
           "tableFrom": "resource_relationship",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2184,12 +2037,8 @@
           "name": "resource_schema_workspace_id_workspace_id_fk",
           "tableFrom": "resource_schema",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2262,12 +2111,8 @@
           "name": "resource_variable_resource_id_resource_id_fk",
           "tableFrom": "resource_variable",
           "tableTo": "resource",
-          "columnsFrom": [
-            "resource_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["resource_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2318,12 +2163,8 @@
           "name": "resource_view_workspace_id_workspace_id_fk",
           "tableFrom": "resource_view",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2377,12 +2218,8 @@
           "name": "azure_tenant_workspace_id_workspace_id_fk",
           "tableFrom": "azure_tenant",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2449,12 +2286,8 @@
           "name": "resource_provider_workspace_id_workspace_id_fk",
           "tableFrom": "resource_provider",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2506,12 +2339,8 @@
           "name": "resource_provider_aws_resource_provider_id_resource_provider_id_fk",
           "tableFrom": "resource_provider_aws",
           "tableTo": "resource_provider",
-          "columnsFrom": [
-            "resource_provider_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["resource_provider_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2555,12 +2384,8 @@
           "name": "resource_provider_azure_resource_provider_id_resource_provider_id_fk",
           "tableFrom": "resource_provider_azure",
           "tableTo": "resource_provider",
-          "columnsFrom": [
-            "resource_provider_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["resource_provider_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -2568,12 +2393,8 @@
           "name": "resource_provider_azure_tenant_id_azure_tenant_id_fk",
           "tableFrom": "resource_provider_azure",
           "tableTo": "azure_tenant",
-          "columnsFrom": [
-            "tenant_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["tenant_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2646,12 +2467,8 @@
           "name": "resource_provider_google_resource_provider_id_resource_provider_id_fk",
           "tableFrom": "resource_provider_google",
           "tableTo": "resource_provider",
-          "columnsFrom": [
-            "resource_provider_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["resource_provider_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2767,12 +2584,8 @@
           "name": "deployment_version_deployment_id_deployment_id_fk",
           "tableFrom": "deployment_version",
           "tableTo": "deployment",
-          "columnsFrom": [
-            "deployment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2846,12 +2659,8 @@
           "name": "deployment_version_channel_deployment_id_deployment_id_fk",
           "tableFrom": "deployment_version_channel",
           "tableTo": "deployment",
-          "columnsFrom": [
-            "deployment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2918,12 +2727,8 @@
           "name": "deployment_version_dependency_deployment_version_id_deployment_version_id_fk",
           "tableFrom": "deployment_version_dependency",
           "tableTo": "deployment_version",
-          "columnsFrom": [
-            "deployment_version_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -2931,12 +2736,8 @@
           "name": "deployment_version_dependency_deployment_id_deployment_id_fk",
           "tableFrom": "deployment_version_dependency",
           "tableTo": "deployment",
-          "columnsFrom": [
-            "deployment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -3006,12 +2807,8 @@
           "name": "release_job_trigger_job_id_job_id_fk",
           "tableFrom": "release_job_trigger",
           "tableTo": "job",
-          "columnsFrom": [
-            "job_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["job_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         },
@@ -3019,12 +2816,8 @@
           "name": "release_job_trigger_caused_by_id_user_id_fk",
           "tableFrom": "release_job_trigger",
           "tableTo": "user",
-          "columnsFrom": [
-            "caused_by_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["caused_by_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         },
@@ -3032,12 +2825,8 @@
           "name": "release_job_trigger_deployment_version_id_deployment_version_id_fk",
           "tableFrom": "release_job_trigger",
           "tableTo": "deployment_version",
-          "columnsFrom": [
-            "deployment_version_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -3045,12 +2834,8 @@
           "name": "release_job_trigger_resource_id_resource_id_fk",
           "tableFrom": "release_job_trigger",
           "tableTo": "resource",
-          "columnsFrom": [
-            "resource_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["resource_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -3058,12 +2843,8 @@
           "name": "release_job_trigger_environment_id_environment_id_fk",
           "tableFrom": "release_job_trigger",
           "tableTo": "environment",
-          "columnsFrom": [
-            "environment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["environment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -3073,9 +2854,7 @@
         "release_job_trigger_job_id_unique": {
           "name": "release_job_trigger_job_id_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "job_id"
-          ]
+          "columns": ["job_id"]
         }
       }
     },
@@ -3137,12 +2916,8 @@
           "name": "deployment_version_metadata_deployment_version_id_deployment_version_id_fk",
           "tableFrom": "deployment_version_metadata",
           "tableTo": "deployment_version",
-          "columnsFrom": [
-            "deployment_version_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -3215,12 +2990,8 @@
           "name": "system_workspace_id_workspace_id_fk",
           "tableFrom": "system",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -3277,12 +3048,8 @@
           "name": "runbook_system_id_system_id_fk",
           "tableFrom": "runbook",
           "tableTo": "system",
-          "columnsFrom": [
-            "system_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -3290,12 +3057,8 @@
           "name": "runbook_job_agent_id_job_agent_id_fk",
           "tableFrom": "runbook",
           "tableTo": "job_agent",
-          "columnsFrom": [
-            "job_agent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["job_agent_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -3340,12 +3103,8 @@
           "name": "runbook_job_trigger_job_id_job_id_fk",
           "tableFrom": "runbook_job_trigger",
           "tableTo": "job",
-          "columnsFrom": [
-            "job_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["job_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -3353,12 +3112,8 @@
           "name": "runbook_job_trigger_runbook_id_runbook_id_fk",
           "tableFrom": "runbook_job_trigger",
           "tableTo": "runbook",
-          "columnsFrom": [
-            "runbook_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["runbook_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -3368,9 +3123,7 @@
         "runbook_job_trigger_job_id_unique": {
           "name": "runbook_job_trigger_job_id_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "job_id"
-          ]
+          "columns": ["job_id"]
         }
       }
     },
@@ -3404,12 +3157,8 @@
           "name": "team_workspace_id_workspace_id_fk",
           "tableFrom": "team",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -3469,12 +3218,8 @@
           "name": "team_member_team_id_team_id_fk",
           "tableFrom": "team_member",
           "tableTo": "team",
-          "columnsFrom": [
-            "team_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["team_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -3482,12 +3227,8 @@
           "name": "team_member_user_id_user_id_fk",
           "tableFrom": "team_member",
           "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -3611,12 +3352,8 @@
           "name": "job_job_agent_id_job_agent_id_fk",
           "tableFrom": "job",
           "tableTo": "job_agent",
-          "columnsFrom": [
-            "job_agent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["job_agent_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -3682,12 +3419,8 @@
           "name": "job_metadata_job_id_job_id_fk",
           "tableFrom": "job_metadata",
           "tableTo": "job",
-          "columnsFrom": [
-            "job_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["job_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -3760,12 +3493,8 @@
           "name": "job_variable_job_id_job_id_fk",
           "tableFrom": "job_variable",
           "tableTo": "job",
-          "columnsFrom": [
-            "job_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["job_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -3823,9 +3552,7 @@
         "workspace_slug_unique": {
           "name": "workspace_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       }
     },
@@ -3913,12 +3640,8 @@
           "name": "workspace_email_domain_matching_workspace_id_workspace_id_fk",
           "tableFrom": "workspace_email_domain_matching",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -3926,12 +3649,8 @@
           "name": "workspace_email_domain_matching_role_id_role_id_fk",
           "tableFrom": "workspace_email_domain_matching",
           "tableTo": "role",
-          "columnsFrom": [
-            "role_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["role_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -3975,12 +3694,8 @@
           "name": "variable_set_system_id_system_id_fk",
           "tableFrom": "variable_set",
           "tableTo": "system",
-          "columnsFrom": [
-            "system_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["system_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4018,12 +3733,8 @@
           "name": "variable_set_environment_variable_set_id_variable_set_id_fk",
           "tableFrom": "variable_set_environment",
           "tableTo": "variable_set",
-          "columnsFrom": [
-            "variable_set_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["variable_set_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -4031,12 +3742,8 @@
           "name": "variable_set_environment_environment_id_environment_id_fk",
           "tableFrom": "variable_set_environment",
           "tableTo": "environment",
-          "columnsFrom": [
-            "environment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["environment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4102,12 +3809,8 @@
           "name": "variable_set_value_variable_set_id_variable_set_id_fk",
           "tableFrom": "variable_set_value",
           "tableTo": "variable_set",
-          "columnsFrom": [
-            "variable_set_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["variable_set_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4164,12 +3867,8 @@
           "name": "workspace_invite_token_role_id_role_id_fk",
           "tableFrom": "workspace_invite_token",
           "tableTo": "role",
-          "columnsFrom": [
-            "role_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["role_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -4177,12 +3876,8 @@
           "name": "workspace_invite_token_workspace_id_workspace_id_fk",
           "tableFrom": "workspace_invite_token",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -4190,12 +3885,8 @@
           "name": "workspace_invite_token_created_by_user_id_fk",
           "tableFrom": "workspace_invite_token",
           "tableTo": "user",
-          "columnsFrom": [
-            "created_by"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4205,9 +3896,7 @@
         "workspace_invite_token_token_unique": {
           "name": "workspace_invite_token_token_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "token"
-          ]
+          "columns": ["token"]
         }
       }
     },
@@ -4260,12 +3949,8 @@
           "name": "resource_metadata_group_workspace_id_workspace_id_fk",
           "tableFrom": "resource_metadata_group",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4351,12 +4036,8 @@
           "name": "runbook_variable_runbook_id_runbook_id_fk",
           "tableFrom": "runbook_variable",
           "tableTo": "runbook",
-          "columnsFrom": [
-            "runbook_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["runbook_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4454,12 +4135,8 @@
           "name": "entity_role_role_id_role_id_fk",
           "tableFrom": "entity_role",
           "tableTo": "role",
-          "columnsFrom": [
-            "role_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["role_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4503,12 +4180,8 @@
           "name": "role_workspace_id_workspace_id_fk",
           "tableFrom": "role",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4568,12 +4241,8 @@
           "name": "role_permission_role_id_role_id_fk",
           "tableFrom": "role_permission",
           "tableTo": "role",
-          "columnsFrom": [
-            "role_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["role_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4646,12 +4315,8 @@
           "name": "job_agent_workspace_id_workspace_id_fk",
           "tableFrom": "job_agent",
           "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -4738,12 +4403,8 @@
           "name": "environment_policy_deployment_version_channel_policy_id_environment_policy_id_fk",
           "tableFrom": "environment_policy_deployment_version_channel",
           "tableTo": "environment_policy",
-          "columnsFrom": [
-            "policy_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["policy_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -4751,12 +4412,8 @@
           "name": "environment_policy_deployment_version_channel_channel_id_deployment_version_channel_id_fk",
           "tableFrom": "environment_policy_deployment_version_channel",
           "tableTo": "deployment_version_channel",
-          "columnsFrom": [
-            "channel_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["channel_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -4764,12 +4421,8 @@
           "name": "environment_policy_deployment_version_channel_deployment_id_deployment_id_fk",
           "tableFrom": "environment_policy_deployment_version_channel",
           "tableTo": "deployment",
-          "columnsFrom": [
-            "deployment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["deployment_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -4782,70 +4435,42 @@
     "public.system_role": {
       "name": "system_role",
       "schema": "public",
-      "values": [
-        "user",
-        "admin"
-      ]
+      "values": ["user", "admin"]
     },
     "public.environment_policy_approval_requirement": {
       "name": "environment_policy_approval_requirement",
       "schema": "public",
-      "values": [
-        "manual",
-        "automatic"
-      ]
+      "values": ["manual", "automatic"]
     },
     "public.approval_status_type": {
       "name": "approval_status_type",
       "schema": "public",
-      "values": [
-        "pending",
-        "approved",
-        "rejected"
-      ]
+      "values": ["pending", "approved", "rejected"]
     },
     "public.environment_policy_deployment_success_type": {
       "name": "environment_policy_deployment_success_type",
       "schema": "public",
-      "values": [
-        "all",
-        "some",
-        "optional"
-      ]
+      "values": ["all", "some", "optional"]
     },
     "public.recurrence_type": {
       "name": "recurrence_type",
       "schema": "public",
-      "values": [
-        "hourly",
-        "daily",
-        "weekly",
-        "monthly"
-      ]
+      "values": ["hourly", "daily", "weekly", "monthly"]
     },
     "public.release_sequencing_type": {
       "name": "release_sequencing_type",
       "schema": "public",
-      "values": [
-        "wait",
-        "cancel"
-      ]
+      "values": ["wait", "cancel"]
     },
     "public.github_entity_type": {
       "name": "github_entity_type",
       "schema": "public",
-      "values": [
-        "organization",
-        "user"
-      ]
+      "values": ["organization", "user"]
     },
     "public.resource_relationship_type": {
       "name": "resource_relationship_type",
       "schema": "public",
-      "values": [
-        "associated_with",
-        "depends_on"
-      ]
+      "values": ["associated_with", "depends_on"]
     },
     "public.release_job_trigger_type": {
       "name": "release_job_trigger_type",
@@ -4866,11 +4491,7 @@
     "public.deployment_version_status": {
       "name": "deployment_version_status",
       "schema": "public",
-      "values": [
-        "building",
-        "ready",
-        "failed"
-      ]
+      "values": ["building", "ready", "failed"]
     },
     "public.job_reason": {
       "name": "job_reason",
@@ -4901,10 +4522,7 @@
     "public.entity_type": {
       "name": "entity_type",
       "schema": "public",
-      "values": [
-        "user",
-        "team"
-      ]
+      "values": ["user", "team"]
     },
     "public.scope_type": {
       "name": "scope_type",
@@ -4936,4 +4554,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json
index d67137cb5..ecd30d933 100644
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -542,4 +542,4 @@
       "breakpoints": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/db/src/schema/release.ts b/packages/db/src/schema/release.ts
index e0767b169..93c36fcfd 100644
--- a/packages/db/src/schema/release.ts
+++ b/packages/db/src/schema/release.ts
@@ -191,7 +191,7 @@ export const releaseJobTrigger = pgTable(
     type: releaseJobTriggerType("type").notNull(),
     causedById: uuid("caused_by_id").references(() => user.id),
 
-    releaseId: uuid("deployment_version_id")
+    versionId: uuid("deployment_version_id")
       .references(() => deploymentVersion.id, { onDelete: "cascade" })
       .notNull(),
     resourceId: uuid("resource_id")
diff --git a/packages/job-dispatch/src/__test__/job-variables-deployment.test.ts b/packages/job-dispatch/src/__test__/job-variables-deployment.test.ts
index 643c7767a..45496b482 100644
--- a/packages/job-dispatch/src/__test__/job-variables-deployment.test.ts
+++ b/packages/job-dispatch/src/__test__/job-variables-deployment.test.ts
@@ -46,7 +46,7 @@ const job: Job = {
     id: "0",
     jobId: "0",
     type: "new_release",
-    releaseId: "0",
+    versionId: "0",
     resourceId: "0",
     environmentId: "0",
     createdAt: new Date(),
diff --git a/packages/job-dispatch/src/cancel-previous-jobs.ts b/packages/job-dispatch/src/cancel-previous-jobs.ts
index a8310cb56..598ea87e3 100644
--- a/packages/job-dispatch/src/cancel-previous-jobs.ts
+++ b/packages/job-dispatch/src/cancel-previous-jobs.ts
@@ -23,7 +23,7 @@ export const cancelPreviousJobsForRedeployedTriggers = async (
       or(
         ...releaseJobTriggers.map((trigger) =>
           and(
-            eq(schema.releaseJobTrigger.releaseId, trigger.releaseId),
+            eq(schema.releaseJobTrigger.versionId, trigger.versionId),
             eq(schema.releaseJobTrigger.environmentId, trigger.environmentId),
             eq(schema.releaseJobTrigger.resourceId, trigger.resourceId),
             eq(schema.job.status, JobStatus.Pending),
diff --git a/packages/job-dispatch/src/environment-release-channel-update.ts b/packages/job-dispatch/src/environment-release-channel-update.ts
index aff9141f9..94214d9d8 100644
--- a/packages/job-dispatch/src/environment-release-channel-update.ts
+++ b/packages/job-dispatch/src/environment-release-channel-update.ts
@@ -73,7 +73,7 @@ const cancelJobsForExcludedReleases = async (
     )
     .innerJoin(
       SCHEMA.deploymentVersion,
-      eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
+      eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
     )
     .where(
       and(
diff --git a/packages/job-dispatch/src/job-creation.ts b/packages/job-dispatch/src/job-creation.ts
index 78c0e497e..bb79fbc71 100644
--- a/packages/job-dispatch/src/job-creation.ts
+++ b/packages/job-dispatch/src/job-creation.ts
@@ -79,7 +79,7 @@ export const onJobCompletion = async (je: schema.Job) => {
     .from(schema.releaseJobTrigger)
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.deployment,
@@ -93,7 +93,7 @@ export const onJobCompletion = async (je: schema.Job) => {
     .then(takeFirst);
 
   const isDependentOnTriggerForCriteria = and(
-    eq(schema.releaseJobTrigger.releaseId, triggers.deployment_version.id),
+    eq(schema.releaseJobTrigger.versionId, triggers.deployment_version.id),
     eq(
       schema.environmentPolicyDeployment.environmentId,
       triggers.release_job_trigger.environmentId,
@@ -125,7 +125,7 @@ export const onJobCompletion = async (je: schema.Job) => {
     .from(schema.releaseJobTrigger)
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.deployment,
@@ -152,7 +152,7 @@ export const onJobCompletion = async (je: schema.Job) => {
       and(
         eq(
           schema.releaseDependency.releaseId,
-          schema.releaseJobTrigger.releaseId,
+          schema.releaseJobTrigger.versionId,
         ),
         eq(schema.releaseDependency.deploymentId, triggers.deployment.id),
       ),
diff --git a/packages/job-dispatch/src/job-failure.ts b/packages/job-dispatch/src/job-failure.ts
index 7153e9295..1773a1624 100644
--- a/packages/job-dispatch/src/job-failure.ts
+++ b/packages/job-dispatch/src/job-failure.ts
@@ -13,7 +13,7 @@ export const onJobFailure = async (job: schema.Job) => {
     .from(schema.releaseJobTrigger)
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.deployment,
@@ -29,7 +29,7 @@ export const onJobFailure = async (job: schema.Job) => {
     .from(schema.releaseJobTrigger)
     .where(
       and(
-        eq(schema.releaseJobTrigger.releaseId, jobInfo.deployment_version.id),
+        eq(schema.releaseJobTrigger.versionId, jobInfo.deployment_version.id),
         eq(
           schema.releaseJobTrigger.environmentId,
           jobInfo.release_job_trigger.environmentId,
diff --git a/packages/job-dispatch/src/job-variables-deployment/job-variables-deployment.ts b/packages/job-dispatch/src/job-variables-deployment/job-variables-deployment.ts
index b1963e51c..1f866f940 100644
--- a/packages/job-dispatch/src/job-variables-deployment/job-variables-deployment.ts
+++ b/packages/job-dispatch/src/job-variables-deployment/job-variables-deployment.ts
@@ -29,7 +29,7 @@ export const determineVariablesForReleaseJob = async (
 ): Promise<schema.JobVariable[]> => {
   const variables = await utils.getDeploymentVariables(
     tx,
-    job.releaseJobTrigger.releaseId,
+    job.releaseJobTrigger.versionId,
   );
 
   if (variables.length === 0) return [];
diff --git a/packages/job-dispatch/src/pending-job-checker.ts b/packages/job-dispatch/src/pending-job-checker.ts
index 855127c97..5f3c5c92e 100644
--- a/packages/job-dispatch/src/pending-job-checker.ts
+++ b/packages/job-dispatch/src/pending-job-checker.ts
@@ -11,7 +11,7 @@ export const isPassingNoPendingJobsPolicy: ReleasePolicyChecker = async (
   wf.length > 0
     ? db
         .selectDistinctOn([
-          SCHEMA.releaseJobTrigger.releaseId,
+          SCHEMA.releaseJobTrigger.versionId,
           SCHEMA.releaseJobTrigger.resourceId,
           SCHEMA.releaseJobTrigger.environmentId,
         ])
@@ -27,8 +27,8 @@ export const isPassingNoPendingJobsPolicy: ReleasePolicyChecker = async (
               wf.map((w) => w.environmentId),
             ),
             inArray(
-              SCHEMA.releaseJobTrigger.releaseId,
-              wf.map((w) => w.releaseId),
+              SCHEMA.releaseJobTrigger.versionId,
+              wf.map((w) => w.versionId),
             ),
             inArray(
               SCHEMA.releaseJobTrigger.resourceId,
@@ -45,7 +45,7 @@ export const isPassingNoPendingJobsPolicy: ReleasePolicyChecker = async (
             (w) =>
               !rows.some(
                 (r) =>
-                  r.release_job_trigger.releaseId === w.releaseId &&
+                  r.release_job_trigger.versionId === w.versionId &&
                   r.release_job_trigger.resourceId === w.resourceId &&
                   r.release_job_trigger.environmentId === w.environmentId,
               ),
diff --git a/packages/job-dispatch/src/policies/concurrency-policy.ts b/packages/job-dispatch/src/policies/concurrency-policy.ts
index e979cb779..9f8d8b26b 100644
--- a/packages/job-dispatch/src/policies/concurrency-policy.ts
+++ b/packages/job-dispatch/src/policies/concurrency-policy.ts
@@ -25,7 +25,7 @@ export const isPassingConcurrencyPolicy: ReleaseIdPolicyChecker = async (
     .from(schema.releaseJobTrigger)
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.environment,
@@ -76,7 +76,7 @@ export const isPassingConcurrencyPolicy: ReleaseIdPolicyChecker = async (
     )
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.environment,
diff --git a/packages/job-dispatch/src/policies/gradual-rollout.ts b/packages/job-dispatch/src/policies/gradual-rollout.ts
index 382526c71..0c4624290 100644
--- a/packages/job-dispatch/src/policies/gradual-rollout.ts
+++ b/packages/job-dispatch/src/policies/gradual-rollout.ts
@@ -78,7 +78,7 @@ export const isPassingJobRolloutPolicy: ReleaseIdPolicyChecker = async (
     .from(schema.releaseJobTrigger)
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.environment,
diff --git a/packages/job-dispatch/src/policies/manual-approval.ts b/packages/job-dispatch/src/policies/manual-approval.ts
index 9c5312051..8822d564e 100644
--- a/packages/job-dispatch/src/policies/manual-approval.ts
+++ b/packages/job-dispatch/src/policies/manual-approval.ts
@@ -22,7 +22,7 @@ export const isPassingApprovalPolicy: ReleaseIdPolicyChecker = async (
     .from(schema.releaseJobTrigger)
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.environment,
diff --git a/packages/job-dispatch/src/policies/min-release-interval-policy.ts b/packages/job-dispatch/src/policies/min-release-interval-policy.ts
index b2fa83de2..7807b48e6 100644
--- a/packages/job-dispatch/src/policies/min-release-interval-policy.ts
+++ b/packages/job-dispatch/src/policies/min-release-interval-policy.ts
@@ -42,7 +42,7 @@ const latestCompletedReleaseSubQuery = (db: Tx, environmentIds: string[]) =>
             .where(
               and(
                 eq(
-                  SCHEMA.releaseJobTrigger.releaseId,
+                  SCHEMA.releaseJobTrigger.versionId,
                   SCHEMA.deploymentVersion.id,
                 ),
                 eq(
@@ -64,7 +64,7 @@ const latestCompletedReleaseSubQuery = (db: Tx, environmentIds: string[]) =>
             .where(
               and(
                 eq(
-                  SCHEMA.releaseJobTrigger.releaseId,
+                  SCHEMA.releaseJobTrigger.versionId,
                   SCHEMA.deploymentVersion.id,
                 ),
                 eq(
@@ -101,7 +101,7 @@ export const isPassingMinReleaseIntervalPolicy: ReleaseIdPolicyChecker = async (
     .where(
       inArray(
         SCHEMA.deploymentVersion.id,
-        releaseJobTriggers.map((rjt) => rjt.releaseId),
+        releaseJobTriggers.map((rjt) => rjt.versionId),
       ),
     );
 
@@ -152,10 +152,10 @@ export const isPassingMinReleaseIntervalPolicy: ReleaseIdPolicyChecker = async (
     );
 
   return _.chain(releaseJobTriggers)
-    .groupBy((rjt) => [rjt.environmentId, rjt.releaseId])
+    .groupBy((rjt) => [rjt.environmentId, rjt.versionId])
     .filter((groupedTriggers) => {
       const release = releases.find(
-        (r) => r.id === groupedTriggers[0]!.releaseId,
+        (r) => r.id === groupedTriggers[0]!.versionId,
       );
       if (!release) return false;
 
diff --git a/packages/job-dispatch/src/policies/release-dependency.ts b/packages/job-dispatch/src/policies/release-dependency.ts
index 5fdaf2ad8..a00594d18 100644
--- a/packages/job-dispatch/src/policies/release-dependency.ts
+++ b/packages/job-dispatch/src/policies/release-dependency.ts
@@ -22,7 +22,7 @@ export const isPassingReleaseDependencyPolicy = async (
           schema.releaseDependency,
           eq(schema.deploymentVersion.id, schema.releaseDependency.releaseId),
         )
-        .where(eq(schema.deploymentVersion.id, trigger.releaseId));
+        .where(eq(schema.deploymentVersion.id, trigger.versionId));
 
       if (release.length === 0) return trigger;
 
@@ -90,11 +90,11 @@ export const isPassingReleaseDependencyPolicy = async (
           .select({
             id: schema.releaseJobTrigger.id,
             resourceId: schema.releaseJobTrigger.resourceId,
-            releaseId: schema.releaseJobTrigger.releaseId,
+            versionId: schema.releaseJobTrigger.versionId,
             status: schema.job.status,
             createdAt: schema.job.createdAt,
             rank: sql<number>`ROW_NUMBER() OVER (
-              PARTITION BY ${schema.releaseJobTrigger.resourceId}, ${schema.releaseJobTrigger.releaseId}
+              PARTITION BY ${schema.releaseJobTrigger.resourceId}, ${schema.releaseJobTrigger.versionId}
               ORDER BY ${schema.job.createdAt} DESC
             )`.as("rank"),
           })
@@ -114,7 +114,7 @@ export const isPassingReleaseDependencyPolicy = async (
           )
           .innerJoin(
             latestJobSubquery,
-            eq(latestJobSubquery.releaseId, schema.deploymentVersion.id),
+            eq(latestJobSubquery.versionId, schema.deploymentVersion.id),
           )
           .where(
             and(
diff --git a/packages/job-dispatch/src/policies/release-sequencing.ts b/packages/job-dispatch/src/policies/release-sequencing.ts
index b971a36e3..9ab2dbac6 100644
--- a/packages/job-dispatch/src/policies/release-sequencing.ts
+++ b/packages/job-dispatch/src/policies/release-sequencing.ts
@@ -35,7 +35,7 @@ export const isPassingNoActiveJobsPolicy: ReleaseIdPolicyChecker = async (
     .from(schema.releaseJobTrigger)
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.deployment,
@@ -51,7 +51,7 @@ export const isPassingNoActiveJobsPolicy: ReleaseIdPolicyChecker = async (
           db.execute(sql<schema.Job[]>`
             select 1 from ${schema.job}
             inner join ${schema.releaseJobTrigger} as rjt2 on ${schema.job.id} = rjt2.job_id
-            inner join ${schema.deploymentVersion} as release2 on rjt2.deployment_version_id = release2.id
+            inner join ${schema.deploymentVersion} as release2 on rjt2.version_id = release2.id
             inner join ${schema.resource} on rjt2.resource_id = ${schema.resource.id}
             where rjt2.environment_id = ${schema.releaseJobTrigger.environmentId}
             and release2.deployment_id = ${schema.deployment.id}
@@ -129,7 +129,7 @@ const isReleaseLatestActiveForEnvironment = async (
     .from(schema.deploymentVersion)
     .innerJoin(
       schema.releaseJobTrigger,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(schema.job, eq(schema.releaseJobTrigger.jobId, schema.job.id))
     .innerJoin(
@@ -174,17 +174,17 @@ export const isPassingNewerThanLastActiveReleasePolicy: ReleaseIdPolicyChecker =
   async (db, releaseJobTriggers) => {
     if (releaseJobTriggers.length === 0) return [];
 
-    const releaseIds = releaseJobTriggers.map((rjt) => rjt.releaseId);
+    const versionIds = releaseJobTriggers.map((rjt) => rjt.versionId);
     const releases = await db
       .select()
       .from(schema.deploymentVersion)
-      .where(inArray(schema.deploymentVersion.id, releaseIds));
+      .where(inArray(schema.deploymentVersion.id, versionIds));
 
     return _.chain(releaseJobTriggers)
-      .groupBy((rjt) => [rjt.releaseId, rjt.environmentId])
+      .groupBy((rjt) => [rjt.versionId, rjt.environmentId])
       .map(async (groupedTriggers) => {
         const release = releases.find(
-          (r) => r.id === groupedTriggers[0]!.releaseId,
+          (r) => r.id === groupedTriggers[0]!.versionId,
         );
         if (!release) return [];
         const { environmentId } = groupedTriggers[0]!;
diff --git a/packages/job-dispatch/src/policies/release-string-check.ts b/packages/job-dispatch/src/policies/release-string-check.ts
index 6f6055500..d1df28834 100644
--- a/packages/job-dispatch/src/policies/release-string-check.ts
+++ b/packages/job-dispatch/src/policies/release-string-check.ts
@@ -63,17 +63,17 @@ export const isPassingReleaseStringCheckPolicy: ReleasePolicyChecker = async (
         .value(),
     );
 
-  const releaseIds = wf.map((v) => v.releaseId).filter(isPresent);
+  const versionIds = wf.map((v) => v.versionId).filter(isPresent);
   const rels = await db
     .select()
     .from(schema.deploymentVersion)
-    .where(inArray(schema.deploymentVersion.id, releaseIds));
+    .where(inArray(schema.deploymentVersion.id, versionIds));
 
   const promises = wf.map(async (wf) => {
     const env = envs.find((e) => e.environment.id === wf.environmentId);
     if (env == null) return null;
 
-    const release = rels.find((r) => r.id === wf.releaseId);
+    const release = rels.find((r) => r.id === wf.versionId);
     if (release == null) return null;
 
     const policyReleaseChannel = env.policy.releaseChannels.find(
diff --git a/packages/job-dispatch/src/policies/success-rate-criteria-passing.ts b/packages/job-dispatch/src/policies/success-rate-criteria-passing.ts
index 23ef40be3..596cccc74 100644
--- a/packages/job-dispatch/src/policies/success-rate-criteria-passing.ts
+++ b/packages/job-dispatch/src/policies/success-rate-criteria-passing.ts
@@ -32,7 +32,7 @@ const isSuccessCriteriaPassing = async (
     .where(
       and(
         eq(schema.environmentPolicyDeployment.policyId, policy.id),
-        eq(schema.releaseJobTrigger.releaseId, release.id),
+        eq(schema.releaseJobTrigger.versionId, release.id),
       ),
     );
 
@@ -67,7 +67,7 @@ export const isPassingCriteriaPolicy: ReleaseIdPolicyChecker = async (
     .from(schema.releaseJobTrigger)
     .innerJoin(
       schema.deploymentVersion,
-      eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
+      eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
     )
     .innerJoin(
       schema.environment,
diff --git a/packages/job-dispatch/src/policy-create.ts b/packages/job-dispatch/src/policy-create.ts
index bf1b22396..524992ee9 100644
--- a/packages/job-dispatch/src/policy-create.ts
+++ b/packages/job-dispatch/src/policy-create.ts
@@ -17,7 +17,7 @@ export const createJobApprovals = async (
     .from(SCHEMA.releaseJobTrigger)
     .innerJoin(
       SCHEMA.deploymentVersion,
-      eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
+      eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
     )
     .innerJoin(
       SCHEMA.environment,
@@ -33,7 +33,7 @@ export const createJobApprovals = async (
     .where(
       inArray(
         SCHEMA.deploymentVersion.id,
-        releaseJobTriggers.map((t) => t.releaseId).filter(isPresent),
+        releaseJobTriggers.map((t) => t.versionId).filter(isPresent),
       ),
     );
 
diff --git a/packages/job-dispatch/src/release-job-trigger.ts b/packages/job-dispatch/src/release-job-trigger.ts
index 50d4f2549..4107881e4 100644
--- a/packages/job-dispatch/src/release-job-trigger.ts
+++ b/packages/job-dispatch/src/release-job-trigger.ts
@@ -172,7 +172,7 @@ class ReleaseJobTriggerBuilder {
       causedById: this._causedById,
       resourceId: v.resource.id,
       environmentId: v.environment.id,
-      releaseId:
+      versionId:
         "deployment_version" in v ? v.deployment_version.id : v.release.id,
       jobId: "",
     }));
@@ -195,14 +195,14 @@ class ReleaseJobTriggerBuilder {
       .where(
         inArray(
           SCHEMA.deploymentVersion.id,
-          wt.map((t) => t.releaseId),
+          wt.map((t) => t.versionId),
         ),
       );
 
     const jobInserts = wt
       .map((t) => {
         const release = releases.find(
-          (r) => r.deployment_version.id === t.releaseId,
+          (r) => r.deployment_version.id === t.versionId,
         );
         if (!release) return null;
         return {
diff --git a/packages/job-dispatch/src/release-sequencing.ts b/packages/job-dispatch/src/release-sequencing.ts
index 9859ca4ef..1dc624549 100644
--- a/packages/job-dispatch/src/release-sequencing.ts
+++ b/packages/job-dispatch/src/release-sequencing.ts
@@ -32,7 +32,7 @@ export const cancelOldReleaseJobTriggersOnJobDispatch = async (
       ${schema.deploymentVersion.createdAt} as cancelReleaseCreatedAt
     from ${schema.job}
     inner join ${schema.releaseJobTrigger} on ${schema.job.id} = ${schema.releaseJobTrigger.jobId}
-    inner join ${schema.deploymentVersion} on ${schema.releaseJobTrigger.releaseId} = ${schema.deploymentVersion.id}
+    inner join ${schema.deploymentVersion} on ${schema.releaseJobTrigger.versionId} = ${schema.deploymentVersion.id}
     inner join ${schema.deployment} on ${schema.deploymentVersion.deploymentId} = ${schema.deployment.id}
     where ${schema.job.status} = ${JobStatus.Pending}
   `;
@@ -40,7 +40,7 @@ export const cancelOldReleaseJobTriggersOnJobDispatch = async (
   const jobsToCancelQuery = sql`
     select distinct triggers.jobIdToCancel
     from ${schema.releaseJobTrigger}
-    inner join ${schema.deploymentVersion} on ${schema.releaseJobTrigger.releaseId} = ${schema.deploymentVersion.id}
+    inner join ${schema.deploymentVersion} on ${schema.releaseJobTrigger.versionId} = ${schema.deploymentVersion.id}
     inner join ${schema.deployment} on ${schema.deploymentVersion.deploymentId} = ${schema.deployment.id}
     inner join ${schema.environment} on ${schema.releaseJobTrigger.environmentId} = ${schema.environment.id}
     left join ${schema.environmentPolicy} on ${schema.environment.policyId} = ${schema.environmentPolicy.id}