diff --git a/app/web/src/newhotness/AddComponentModal.vue b/app/web/src/newhotness/AddComponentModal.vue
index 066da77f24..1ea495e1e9 100644
--- a/app/web/src/newhotness/AddComponentModal.vue
+++ b/app/web/src/newhotness/AddComponentModal.vue
@@ -246,7 +246,7 @@ keyEmitter.on("Enter", async () => {
   else
     params = {
       schemaType,
-      schemaVariantId: selectedAsset.value.variant.schemaId,
+      schemaId: selectedAsset.value.variant.schemaId,
     };
 
   // TODO "force changeset"
@@ -254,11 +254,14 @@ keyEmitter.on("Enter", async () => {
   const call = api.endpoint<{ componentId: string }>(routes.CreateComponent, {
     viewId: viewId.value,
   });
-  const resp = await call.post<CreateComponentPayload>(payload);
-  if (api.ok(resp)) {
+  const { req, newChangeSetId } = await call.post<CreateComponentPayload>(
+    payload,
+  );
+  if (api.ok(req)) {
     const params = {
-      ...route.params,
-      componentId: resp.data.componentId,
+      workspacePk: route.params.workspacePk,
+      changeSetId: newChangeSetId || route.params.changeSetId,
+      componentId: req.data.componentId,
     };
     router.push({
       name: "new-hotness-component",
diff --git a/app/web/src/newhotness/AttributePanel.vue b/app/web/src/newhotness/AttributePanel.vue
index 9024a72018..6720605dec 100644
--- a/app/web/src/newhotness/AttributePanel.vue
+++ b/app/web/src/newhotness/AttributePanel.vue
@@ -24,6 +24,7 @@
 <script lang="ts" setup>
 import { computed, reactive, ref, watch } from "vue";
 import { Fzf } from "fzf";
+import { useRoute, useRouter } from "vue-router";
 import {
   AttributeTree,
   BifrostComponent,
@@ -205,6 +206,8 @@ const save = async (path: string, _id: string, value: string) => {
   await call.put<UpdateComponentAttributesArgs>(payload);
 };
 
+const router = useRouter();
+const route = useRoute();
 const remove = async (path: string, _id: string) => {
   const call = api.endpoint<{ success: boolean }>(
     routes.UpdateComponentAttributes,
@@ -213,7 +216,19 @@ const remove = async (path: string, _id: string) => {
   const payload: UpdateComponentAttributesArgs = {};
   path = path.replace("root", ""); // endpoint doesn't want it
   payload[path] = { $source: null };
-  await call.put<UpdateComponentAttributesArgs>(payload);
+  const { req, newChangeSetId } = await call.put<UpdateComponentAttributesArgs>(
+    payload,
+  );
+  if (newChangeSetId && api.ok(req)) {
+    router.push({
+      name: "new-hotness-component",
+      params: {
+        workspacePk: route.params.workspacePk,
+        changeSetId: newChangeSetId,
+        componentId: props.component.id,
+      },
+    });
+  }
 };
 
 // attributeValue is not "value" for maps.. look at children! i suspect the same for arrays, etc
diff --git a/app/web/src/newhotness/Component.vue b/app/web/src/newhotness/Component.vue
index 0a23674709..56467d8fdd 100644
--- a/app/web/src/newhotness/Component.vue
+++ b/app/web/src/newhotness/Component.vue
@@ -190,7 +190,7 @@ import {
   IconButton,
 } from "@si/vue-lib/design-system";
 import { computed, ref, nextTick } from "vue";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { bifrost, useMakeArgs, useMakeKey } from "@/store/realtime/heimdall";
 import {
   BifrostComponent,
@@ -291,6 +291,8 @@ const nameFormData = computed<NameFormData>(() => {
 
 const wForm = useWatchedForm<NameFormData>();
 
+const route = useRoute();
+
 const nameForm = wForm.newForm(nameFormData, async ({ value }) => {
   const name = value.name;
   // i wish the validator narrowed this type to always be a string
@@ -298,7 +300,19 @@ const nameForm = wForm.newForm(nameFormData, async ({ value }) => {
     const id = component.value?.id;
     if (!id) throw new Error("Missing id");
     const call = api.endpoint(routes.UpdateComponentName, { id });
-    await call.put<UpdateComponentNameArgs>({ name });
+    const { req, newChangeSetId } = await call.put<UpdateComponentNameArgs>({
+      name,
+    });
+    if (newChangeSetId && api.ok(req)) {
+      router.push({
+        name: "new-hotness-component",
+        params: {
+          workspacePk: route.params.workspacePk,
+          changeSetId: newChangeSetId,
+          componentId: props.componentId,
+        },
+      });
+    }
   }
 });
 
diff --git a/app/web/src/newhotness/Workspace.vue b/app/web/src/newhotness/Workspace.vue
index 6cdd97db5a..f2b7596b69 100644
--- a/app/web/src/newhotness/Workspace.vue
+++ b/app/web/src/newhotness/Workspace.vue
@@ -90,6 +90,7 @@ import { useFeatureFlagsStore } from "@/store/feature_flags.store";
 import * as heimdall from "@/store/realtime/heimdall";
 import { useAuthStore } from "@/store/auth.store";
 import { useChangeSetsStore } from "@/store/change_sets.store";
+import { useRealtimeStore } from "@/store/realtime/realtime.store";
 import Explore from "./Explore.vue";
 import ComponentDetail from "./Component.vue";
 import FuncRunDetails from "./FuncRunDetails.vue";
@@ -110,6 +111,7 @@ const props = defineProps<{
 const authStore = useAuthStore();
 const featureFlagsStore = useFeatureFlagsStore();
 const changeSetsStore = useChangeSetsStore();
+const realtimeStore = useRealtimeStore();
 
 const workspacePk = computed(() => props.workspacePk);
 const changeSetId = computed(() => props.changeSetId);
@@ -120,6 +122,7 @@ const context = computed<Context>(() => {
     changeSetId,
     user: authStore.user,
     onHead: computed(() => changeSetsStore.headSelected),
+    headChangeSetId: computed(() => changeSetsStore.headChangeSetId ?? ""),
   };
 });
 
@@ -192,6 +195,22 @@ watch(
     heimdall.niflheim(props.workspacePk, props.changeSetId, true);
   },
 );
+realtimeStore.subscribe(
+  "TOP_LEVEL_WORKSPACE",
+  `workspace/${props.workspacePk}`,
+  [
+    {
+      eventType: "ChangeSetCreated",
+      callback: async (data) => {
+        await heimdall.linkNewChangeset(
+          props.workspacePk,
+          data.changeSetId,
+          data.workspaceSnapshotAddress,
+        );
+      },
+    },
+  ],
+);
 
 const connectionShouldBeEnabled = computed(() => {
   try {
diff --git a/app/web/src/newhotness/api_composables/index.ts b/app/web/src/newhotness/api_composables/index.ts
index 6bcef126ec..2472d5cea2 100644
--- a/app/web/src/newhotness/api_composables/index.ts
+++ b/app/web/src/newhotness/api_composables/index.ts
@@ -1,4 +1,4 @@
-import { unref, inject } from "vue";
+import { unref, inject, ref, Ref } from "vue";
 import { AxiosResponse } from "axios";
 import { sdfApiInstance as sdf } from "@/store/apis.web";
 import { ChangeSetId } from "@/api/sdf/dal/change_set";
@@ -204,6 +204,12 @@ export enum routes {
   CreateComponent = "CreateComponent",
 }
 
+/**
+ * Once we implement the action API calls in here
+ * Those routes would also exist in here
+ */
+const CAN_MUTATE_ON_HEAD: readonly routes[] = [] as const;
+
 const _routes: Record<routes, string> = {
   GetFuncRunsPaginated: "/funcs/runs/paginated",
   FuncRun: "/funcs/runs/<id>",
@@ -219,51 +225,91 @@ export class APICall<Response> {
   workspaceId: string;
   changeSetId: string;
   path: string;
-  url: string;
   ctx: Context;
+  canMutateHead: boolean;
+  description: string;
+  inFlight: Ref<boolean>;
 
-  constructor(ctx: Context, path: string) {
+  constructor(
+    ctx: Context,
+    path: string,
+    canMutateHead: boolean,
+    description: string,
+    inFlight: Ref<boolean>,
+  ) {
     this.ctx = ctx;
     const workspaceId = unref(ctx.workspacePk);
     const changeSetId = unref(ctx.changeSetId);
-    const API_PREFIX = `v2/workspaces/${workspaceId}/change-sets/${changeSetId}`;
     this.workspaceId = workspaceId;
     this.changeSetId = changeSetId;
     this.path = path;
-    this.url = `${API_PREFIX}${this.path}`;
+    this.canMutateHead = canMutateHead;
+    this.description = description;
+    this.inFlight = inFlight;
+  }
+
+  url(): string {
+    const API_PREFIX = `v2/workspaces/${this.workspaceId}/change-sets/${this.changeSetId}`;
+    return `${API_PREFIX}${this.path}`;
   }
 
   async get(params?: URLSearchParams) {
+    this.inFlight.value = true;
     const req = await sdf<Response>({
       method: "GET",
-      url: this.url,
+      url: this.url(),
       params,
     });
+    this.inFlight.value = false;
     return req;
   }
 
+  async makeChangeSet() {
+    const req = await sdf<{ id: string }>({
+      method: "POST",
+      url: `v2/workspaces/${this.workspaceId}/change-sets/create_change_set`,
+      data: { name: this.description },
+    });
+    if (req.status === 200) {
+      const newChangeSetId = req.data.id;
+      // following API calls will use the new changeSetId
+      this.changeSetId = newChangeSetId;
+      return newChangeSetId;
+    } else throw new Error("Unable to make change set");
+  }
+
   async put<D = Record<string, unknown>>(data: D, params?: URLSearchParams) {
-    if (this.ctx.onHead.value) throw new Error("Can't make changes on head");
+    this.inFlight.value = true;
+    let newChangeSetId;
+    if (!this.canMutateHead && this.ctx.onHead.value) {
+      newChangeSetId = await this.makeChangeSet();
+    }
 
     const req = await sdf<Response>({
       method: "PUT",
-      url: this.url,
+      url: this.url(),
       params,
       data,
     });
-    return req;
+    this.inFlight.value = false;
+    return { req, newChangeSetId };
   }
 
   async post<D = Record<string, unknown>>(data: D, params?: URLSearchParams) {
-    if (this.ctx.onHead.value) throw new Error("Can't make changes on head");
+    this.inFlight.value = true;
+    let newChangeSetId;
+    if (!this.canMutateHead && this.ctx.onHead.value) {
+      newChangeSetId = await this.makeChangeSet();
+    }
 
     const req = await sdf<Response>({
       method: "POST",
-      url: this.url,
+      url: this.url(),
       params,
       data,
     });
-    return req;
+    this.inFlight.value = false;
+    return { req, newChangeSetId };
   }
 
   // very odd, i tried having a private `innerPostPut` to pass `method = "POST" | "PUT"`
@@ -285,14 +331,19 @@ export const useApi = () => {
     }
   };
 
+  const inFlight = ref(false);
   const endpoint = <Response>(key: routes, args?: Record<string, string>) => {
     let path = _routes[key];
     if (args)
       Object.entries(args).forEach(([k, v]) => {
         path = path.replace(`<${k}>`, v);
       });
-    return new APICall<Response>(ctx, path);
+    const canMutateHead = CAN_MUTATE_ON_HEAD.includes(key);
+    const desc = `${key} ${
+      args ? [...Object.entries(args)].flatMap((m) => m).join(": ") : ""
+    } by ${ctx.user?.name} on ${new Date().toLocaleDateString()}`;
+    return new APICall<Response>(ctx, path, canMutateHead, desc, inFlight);
   };
 
-  return { ok, endpoint };
+  return { ok, endpoint, inFlight };
 };
diff --git a/app/web/src/newhotness/layout_components/ComponentAttribute.vue b/app/web/src/newhotness/layout_components/ComponentAttribute.vue
index 3da300bffc..de275d81ff 100644
--- a/app/web/src/newhotness/layout_components/ComponentAttribute.vue
+++ b/app/web/src/newhotness/layout_components/ComponentAttribute.vue
@@ -79,6 +79,7 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
 import { VButton, IconButton, Icon } from "@si/vue-lib/design-system";
+import { useRoute, useRouter } from "vue-router";
 import { BifrostComponent } from "@/workers/types/dbinterface";
 import AttributeChildLayout from "./AttributeChildLayout.vue";
 import AttributeInput from "./AttributeInput.vue";
@@ -157,6 +158,8 @@ const add = async () => {
   );
 };
 
+const router = useRouter();
+const route = useRoute();
 const showKey = ref(false);
 const wForm = useWatchedForm<{ key: string }>();
 const keyData = ref({ key: "" });
@@ -171,7 +174,19 @@ const keyForm = wForm.newForm(keyData, async ({ value }) => {
       .replace("root", "")
       .replaceAll("\u000b", "/") ?? ""; // endpoint doesn't want it
   payload[`${path}/${value.key}`] = "";
-  await call.put<UpdateComponentAttributesArgs>(payload);
+  const { req, newChangeSetId } = await call.put<UpdateComponentAttributesArgs>(
+    payload,
+  );
+  if (newChangeSetId && api.ok(req)) {
+    router.push({
+      name: "new-hotness-component",
+      params: {
+        workspacePk: route.params.workspacePk,
+        changeSetId: newChangeSetId,
+        componentId: props.component.id,
+      },
+    });
+  }
 });
 
 const saveKey = async () => {
diff --git a/app/web/src/newhotness/types.ts b/app/web/src/newhotness/types.ts
index baea1302ff..9c02ef1094 100644
--- a/app/web/src/newhotness/types.ts
+++ b/app/web/src/newhotness/types.ts
@@ -6,6 +6,7 @@ export interface Context {
   changeSetId: ComputedRef<string>;
   user: User | null;
   onHead: ComputedRef<boolean>;
+  headChangeSetId: ComputedRef<string>;
 }
 
 export function assertIsDefined<T>(value: T | undefined): asserts value is T {
diff --git a/app/web/src/store/realtime/heimdall.ts b/app/web/src/store/realtime/heimdall.ts
index ee78292651..133b9deba1 100644
--- a/app/web/src/store/realtime/heimdall.ts
+++ b/app/web/src/store/realtime/heimdall.ts
@@ -125,6 +125,21 @@ export const getPossibleConnections = async (args: {
   );
 };
 
+export const linkNewChangeset = async (
+  workspaceId: string,
+  changeSetId: string,
+  workspaceSnapshotAddress: string,
+) => {
+  const changeSetsStore = useChangeSetsStore();
+  if (!changeSetsStore.headChangeSetId) throw new Error("Don't have HEAD");
+  await db.linkNewChangeset(
+    workspaceId,
+    changeSetsStore.headChangeSetId,
+    changeSetId,
+    workspaceSnapshotAddress,
+  );
+};
+
 export const getOutgoingConnections = async (args: {
   workspaceId: string;
   changeSetId: ChangeSetId;
diff --git a/app/web/src/store/realtime/realtime.store.ts b/app/web/src/store/realtime/realtime.store.ts
index 4de90c3085..c95cb751cf 100644
--- a/app/web/src/store/realtime/realtime.store.ts
+++ b/app/web/src/store/realtime/realtime.store.ts
@@ -336,7 +336,7 @@ export const useRealtimeStore = defineStore("realtime", () => {
         eventMetadata.actor !== "System" &&
         eventMetadata.actor.User === authStore.userPk
       ) {
-        bufferWatchList.push(eventData);
+        bufferWatchList.push(eventData.changeSetId);
       }
     }
     if (eventKind === "ChangeSetApplied") {
diff --git a/app/web/src/store/realtime/realtime_events.ts b/app/web/src/store/realtime/realtime_events.ts
index 12a745c79f..51f3498be5 100644
--- a/app/web/src/store/realtime/realtime_events.ts
+++ b/app/web/src/store/realtime/realtime_events.ts
@@ -90,7 +90,10 @@ export type WsEventPayloadMap = {
     changeSetId: string | null;
     viewId: string | null;
   };
-  ChangeSetCreated: string;
+  ChangeSetCreated: {
+    changeSetId: string;
+    workspaceSnapshotAddress: string;
+  };
   ChangeSetWritten: string;
   ChangeSetCancelled: string;
   Conflict: string;
diff --git a/app/web/src/workers/types/dbinterface.ts b/app/web/src/workers/types/dbinterface.ts
index a856fc583b..8964f2f446 100644
--- a/app/web/src/workers/types/dbinterface.ts
+++ b/app/web/src/workers/types/dbinterface.ts
@@ -71,6 +71,12 @@ export interface DBInterface {
   initBifrost(): void;
   bifrostClose(): void;
   bifrostReconnect(): void;
+  linkNewChangeset(
+    workspaceId: string,
+    headChangeSetId: string,
+    changeSetId: string,
+    workspaceSnapshotAddress: string,
+  ): Promise<void>;
   getConnectionByAnnotation(
     workspaceId: string,
     changeSetId: string,
diff --git a/app/web/src/workers/webworker.ts b/app/web/src/workers/webworker.ts
index 9df523f208..44751cf3d4 100644
--- a/app/web/src/workers/webworker.ts
+++ b/app/web/src/workers/webworker.ts
@@ -408,7 +408,10 @@ const coldStartComputed = async (workspaceId: string, changeSetId: string) => {
     changeSetId,
     "ComponentList",
     changeSetId,
-  )) as BifrostComponentList;
+  )) as BifrostComponentList | -1;
+
+  if (data === -1) return;
+
   await Promise.all(
     data.components.map((c) =>
       updateComputed(workspaceId, changeSetId, "Component", c, false),
@@ -612,7 +615,6 @@ const insertAtomMTM = async (atom: Atom, toSnapshotAddress: Checksum) => {
     // seeing conflict uniqueness errors, even though the
     // table declaration has ON CONFLICT REPLACE
     error("createMTM failed", atom);
-    throw err;
   }
 };
 
@@ -1142,9 +1144,9 @@ const _getOutgoingConnectionsByComponentId = async (
     changeSetId,
     undefined,
     false, // don't compute
-  )) as BifrostIncomingConnectionsList;
+  )) as BifrostIncomingConnectionsList | -1;
 
-  if (!list || !list.componentConnections) {
+  if (list === -1) {
     debug("...missing connections list...");
     return new DefaultMap<string, BifrostConnection[]>(() => []);
   }
@@ -1393,6 +1395,8 @@ const getReferences = async (
       debug(`Connection ${raw.id} missing own component`);
       hasReferenceError = true;
     }
+    // explicitly setting this as a warning that these fields are not to be used
+    else (component as BifrostComponent).outputCount = -1;
 
     const connections = await Promise.all(
       raw.connections.map(async (c: EddaConnection) => {
@@ -1426,15 +1430,14 @@ const getReferences = async (
           );
           hasReferenceError = true;
         }
+        // explicitly setting this as a warning that these fields are not to be used
+        else (fromComponent as BifrostComponent).outputCount = -1;
 
         const conn: BifrostConnection = {
           ...c,
           fromComponent: fromComponent as BifrostComponent,
           toComponent: component as BifrostComponent,
         };
-        // explicitly setting this as a warning that these fields are not to be used
-        conn.fromComponent.outputCount = -1;
-        conn.toComponent.outputCount = -1;
         return conn;
       }),
     );
@@ -1748,6 +1751,72 @@ const dbInterface: DBInterface = {
     const [changesets, snapshots, atoms, mtm] = await Promise.all([c, s, a, m]);
     return { changesets, snapshots, atoms, mtm };
   },
+  async linkNewChangeset(
+    workspaceId,
+    headChangeSet,
+    changeSetId,
+    workspaceSnapshotAddress,
+  ): Promise<void> {
+    try {
+      const headRows = db.exec({
+        sql: "select snapshot_address from changesets where workspace_id = ? and change_set_id = ? ;",
+        bind: [workspaceId, headChangeSet],
+        returnValue: "resultRows",
+      });
+      const headRow = oneInOne(headRows);
+      if (headRow === NOROW) throw new Error("HEAD is missing");
+      const currentSnapshotAddress = headRow;
+
+      if (currentSnapshotAddress === workspaceSnapshotAddress) {
+        debug("~ new change set, no-op");
+        return; // NO-OP
+      }
+
+      await db.exec({
+        sql: `INSERT INTO snapshots (address) VALUES (?) ON CONFLICT DO NOTHING;`,
+        bind: [workspaceSnapshotAddress],
+      });
+
+      await db.exec({
+        sql: `INSERT INTO snapshots_mtm_atoms
+        SELECT
+          ?, kind, args, checksum
+        FROM snapshots_mtm_atoms
+        WHERE
+          snapshot_address = ?
+        ON CONFLICT DO NOTHING`,
+        bind: [workspaceSnapshotAddress, currentSnapshotAddress],
+      });
+
+      await db.exec({
+        sql: "insert into changesets (change_set_id, workspace_id, snapshot_address) VALUES (?, ?, ?) ON CONFLICT DO NOTHING;",
+        bind: [changeSetId, workspaceId, workspaceSnapshotAddress],
+      });
+    } catch (err) {
+      // NOTE: all the `on conflict do nothing` can be removed
+      // once a new change set only returns after its index has been created
+      // this runs *clean* "in the background" (e.g. on a second client that didn't make the change set)
+      // eslint-disable-next-line no-console
+      console.error("linkNewChangeset", err);
+    }
+
+    // hit the index to populate it
+    // also shouldn't need this
+    const pattern = [
+      "v2",
+      "workspaces",
+      { workspaceId },
+      "change-sets",
+      { changeSetId },
+      "index",
+    ] as URLPattern;
+
+    const [url, _desc] = describePattern(pattern);
+    await sdf<IndexObjectMeta>({
+      method: "get",
+      url,
+    });
+  },
 };
 
 Comlink.expose(dbInterface);
diff --git a/lib/dal/src/change_set.rs b/lib/dal/src/change_set.rs
index 3a3b99a9e6..b58c6f9914 100644
--- a/lib/dal/src/change_set.rs
+++ b/lib/dal/src/change_set.rs
@@ -1005,22 +1005,23 @@ impl ChangeSet {
     /// Returns a new [`ChangeSetId`](ChangeSet) if a new [`ChangeSet`] was created.
     /// Also writes an audit log event to head (so we don't have to handle this in every route handler)
     pub async fn force_new(ctx: &mut DalContext) -> ChangeSetResult<Option<ChangeSetId>> {
-        let maybe_fake_pk =
-            if ctx.change_set_id() == ctx.get_workspace_default_change_set_id().await? {
-                let change_set = Self::fork_head(ctx, Self::generate_name()).await?;
-                ctx.update_visibility_and_snapshot_to_visibility(change_set.id)
-                    .await?;
-                ctx.write_audit_log_to_head(AuditLogKind::CreateChangeSet, change_set.name)
-                    .await?;
-                WsEvent::change_set_created(ctx, change_set.id)
-                    .await?
-                    .publish_on_commit(ctx)
-                    .await?;
+        let maybe_fake_pk = if ctx.change_set_id()
+            == ctx.get_workspace_default_change_set_id().await?
+        {
+            let change_set = Self::fork_head(ctx, Self::generate_name()).await?;
+            ctx.update_visibility_and_snapshot_to_visibility(change_set.id)
+                .await?;
+            ctx.write_audit_log_to_head(AuditLogKind::CreateChangeSet, change_set.name)
+                .await?;
+            WsEvent::change_set_created(ctx, change_set.id, change_set.workspace_snapshot_address)
+                .await?
+                .publish_on_commit(ctx)
+                .await?;
 
-                Some(change_set.id)
-            } else {
-                None
-            };
+            Some(change_set.id)
+        } else {
+            None
+        };
         Ok(maybe_fake_pk)
     }
 
diff --git a/lib/dal/src/change_set/event.rs b/lib/dal/src/change_set/event.rs
index f6690c9ca4..2447df99d9 100644
--- a/lib/dal/src/change_set/event.rs
+++ b/lib/dal/src/change_set/event.rs
@@ -2,6 +2,7 @@ use serde::{
     Deserialize,
     Serialize,
 };
+use si_events::WorkspaceSnapshotAddress;
 
 use crate::{
     ChangeSetId,
@@ -24,8 +25,16 @@ impl WsEvent {
     pub async fn change_set_created(
         ctx: &DalContext,
         change_set_id: ChangeSetId,
+        workspace_snapshot_address: WorkspaceSnapshotAddress,
     ) -> WsEventResult<Self> {
-        WsEvent::new(ctx, WsPayload::ChangeSetCreated(change_set_id)).await
+        WsEvent::new(
+            ctx,
+            WsPayload::ChangeSetCreated(ChangeSetCreatedPayload {
+                change_set_id,
+                workspace_snapshot_address,
+            }),
+        )
+        .await
     }
 
     pub async fn change_set_approval_status_changed(
@@ -191,3 +200,10 @@ pub struct ChangeSetRenamePayload {
     change_set_id: ChangeSetId,
     new_name: String,
 }
+
+#[derive(Clone, Deserialize, Serialize, Debug, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct ChangeSetCreatedPayload {
+    change_set_id: ChangeSetId,
+    workspace_snapshot_address: WorkspaceSnapshotAddress,
+}
diff --git a/lib/dal/src/ws_event.rs b/lib/dal/src/ws_event.rs
index 3e57343f01..37864a30ca 100644
--- a/lib/dal/src/ws_event.rs
+++ b/lib/dal/src/ws_event.rs
@@ -30,6 +30,7 @@ use crate::{
     change_set::event::{
         ChangeSetActorPayload,
         ChangeSetAppliedPayload,
+        ChangeSetCreatedPayload,
         ChangeSetMergeVotePayload,
         ChangeSetRenamePayload,
         ChangeSetStateChangePayload,
@@ -134,7 +135,7 @@ pub enum WsPayload {
     ChangeSetCancelAbandonProcess(ChangeSetActorPayload),
     ChangeSetCancelApprovalProcess(ChangeSetActorPayload),
     ChangeSetCanceled(ChangeSetId),
-    ChangeSetCreated(ChangeSetId),
+    ChangeSetCreated(ChangeSetCreatedPayload),
     ChangeSetMergeVote(ChangeSetMergeVotePayload),
     ChangeSetRename(ChangeSetRenamePayload),
     ChangeSetStatusChanged(ChangeSetStateChangePayload),
diff --git a/lib/luminork-server/src/service/v1/change_sets/create.rs b/lib/luminork-server/src/service/v1/change_sets/create.rs
index bffcd1537b..d9fec98545 100644
--- a/lib/luminork-server/src/service/v1/change_sets/create.rs
+++ b/lib/luminork-server/src/service/v1/change_sets/create.rs
@@ -58,7 +58,7 @@ pub async fn create_change_set(
     ctx.write_audit_log(AuditLogKind::CreateChangeSet, payload.change_set_name)
         .await?;
 
-    WsEvent::change_set_created(ctx, change_set.id)
+    WsEvent::change_set_created(ctx, change_set.id, change_set.workspace_snapshot_address)
         .await?
         .publish_on_commit(ctx)
         .await?;
diff --git a/lib/sdf-server/src/service/public/change_sets.rs b/lib/sdf-server/src/service/public/change_sets.rs
index 7370216b19..5fbec57109 100644
--- a/lib/sdf-server/src/service/public/change_sets.rs
+++ b/lib/sdf-server/src/service/public/change_sets.rs
@@ -89,7 +89,7 @@ async fn create_change_set(
     ctx.write_audit_log(AuditLogKind::CreateChangeSet, payload.change_set_name)
         .await?;
 
-    WsEvent::change_set_created(ctx, change_set.id)
+    WsEvent::change_set_created(ctx, change_set.id, change_set.workspace_snapshot_address)
         .await?
         .publish_on_commit(ctx)
         .await?;
diff --git a/lib/sdf-server/src/service/v2/change_set.rs b/lib/sdf-server/src/service/v2/change_set.rs
index 394f1ab924..9f1db02cbf 100644
--- a/lib/sdf-server/src/service/v2/change_set.rs
+++ b/lib/sdf-server/src/service/v2/change_set.rs
@@ -34,6 +34,7 @@ mod apply;
 mod approval_status;
 mod approve;
 mod cancel_approval_request;
+mod create;
 mod force_apply;
 mod list;
 mod rename;
@@ -151,7 +152,9 @@ pub async fn post_to_webhook(
 }
 
 pub fn change_sets_routes() -> Router<AppState> {
-    Router::new().route("/", get(list::list_actionable))
+    Router::new()
+        .route("/", get(list::list_actionable))
+        .route("/create_change_set", post(create::create_change_set))
 }
 
 pub fn change_set_routes(state: AppState) -> Router<AppState> {
diff --git a/lib/sdf-server/src/service/v2/change_set/create.rs b/lib/sdf-server/src/service/v2/change_set/create.rs
new file mode 100644
index 0000000000..24454e0fe2
--- /dev/null
+++ b/lib/sdf-server/src/service/v2/change_set/create.rs
@@ -0,0 +1,74 @@
+use axum::{
+    Json,
+    extract::{
+        Host,
+        OriginalUri,
+        Path,
+    },
+};
+use dal::{
+    ChangeSet,
+    WorkspacePk,
+    WsEvent,
+};
+use serde::{
+    Deserialize,
+    Serialize,
+};
+use si_events::audit_log::AuditLogKind;
+
+use super::Result;
+use crate::{
+    extract::{
+        HandlerContext,
+        PosthogClient,
+    },
+    service::v2::AccessBuilder,
+    track,
+};
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct Request {
+    pub name: String,
+}
+
+pub async fn create_change_set(
+    HandlerContext(builder): HandlerContext,
+    AccessBuilder(request_ctx): AccessBuilder,
+    PosthogClient(posthog_client): PosthogClient,
+    OriginalUri(original_uri): OriginalUri,
+    Host(host_name): Host,
+    Path(_workspace_pk): Path<WorkspacePk>,
+    Json(Request { name }): Json<Request>,
+) -> Result<Json<si_frontend_types::ChangeSet>> {
+    let ctx = builder.build_head(request_ctx).await?;
+
+    let change_set_name = name.to_owned();
+
+    let change_set = ChangeSet::fork_head(&ctx, change_set_name.clone()).await?;
+
+    track(
+        &posthog_client,
+        &ctx,
+        &original_uri,
+        &host_name,
+        "create_change_set",
+        serde_json::json!({
+                    "change_set_name": change_set_name.clone(),
+        }),
+    );
+
+    ctx.write_audit_log(AuditLogKind::CreateChangeSet, change_set_name.to_string())
+        .await?;
+
+    WsEvent::change_set_created(&ctx, change_set.id, change_set.workspace_snapshot_address)
+        .await?
+        .publish_on_commit(&ctx)
+        .await?;
+
+    let change_set = change_set.into_frontend_type(&ctx).await?;
+    ctx.commit_no_rebase().await?;
+
+    Ok(Json(change_set))
+}
diff --git a/lib/sdf-server/src/service/v2/fs.rs b/lib/sdf-server/src/service/v2/fs.rs
index ff993b109e..2a73b99ecf 100644
--- a/lib/sdf-server/src/service/v2/fs.rs
+++ b/lib/sdf-server/src/service/v2/fs.rs
@@ -228,7 +228,7 @@ pub async fn create_change_set(
     ctx.write_audit_log(AuditLogKind::CreateChangeSet, change_set.name.clone())
         .await?;
 
-    WsEvent::change_set_created(ctx, change_set.id)
+    WsEvent::change_set_created(ctx, change_set.id, change_set.workspace_snapshot_address)
         .await?
         .publish_on_commit(ctx)
         .await?;
diff --git a/lib/sdf-v1-routes-change-sets/src/create_change_set.rs b/lib/sdf-v1-routes-change-sets/src/create_change_set.rs
index a30895bf7e..17c37c418d 100644
--- a/lib/sdf-v1-routes-change-sets/src/create_change_set.rs
+++ b/lib/sdf-v1-routes-change-sets/src/create_change_set.rs
@@ -51,7 +51,7 @@ pub async fn create_change_set(
     ctx.write_audit_log(AuditLogKind::CreateChangeSet, change_set_name.to_string())
         .await?;
 
-    WsEvent::change_set_created(&ctx, change_set.id)
+    WsEvent::change_set_created(&ctx, change_set.id, change_set.workspace_snapshot_address)
         .await?
         .publish_on_commit(&ctx)
         .await?;