diff --git a/.changeset/empty-pants-care.md b/.changeset/empty-pants-care.md
deleted file mode 100644
index f08611ed3fc..00000000000
--- a/.changeset/empty-pants-care.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"shadcn": patch
----
-
-Update spread/unspread helpers to handle ArrayLiteralExpression and nested values within arrays
diff --git a/.changeset/fifty-rivers-sparkle.md b/.changeset/fifty-rivers-sparkle.md
deleted file mode 100644
index 599dcc320d7..00000000000
--- a/.changeset/fifty-rivers-sparkle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"shadcn": patch
----
-
-support aliases longer than one char
diff --git a/.changeset/fresh-turtles-cheat.md b/.changeset/fresh-turtles-cheat.md
deleted file mode 100644
index c338eb0c79b..00000000000
--- a/.changeset/fresh-turtles-cheat.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"shadcn": patch
----
-
-fix handling of aliases
diff --git a/.changeset/twenty-trains-check.md b/.changeset/twenty-trains-check.md
deleted file mode 100644
index f56280c824a..00000000000
--- a/.changeset/twenty-trains-check.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"shadcn-ui": patch
----
-
-replace lodash.template
diff --git a/apps/www/actions/edit-in-v0.ts b/apps/www/actions/edit-in-v0.ts
index 8acff92d8bc..35cd2961136 100644
--- a/apps/www/actions/edit-in-v0.ts
+++ b/apps/www/actions/edit-in-v0.ts
@@ -82,6 +82,17 @@ export async function editInV0({
     // Remove v0 prefix from the name
     registryItem.name = registryItem.name.replace(/^v0-/, "")
 
+    // Replace `@/registry/new-york/` in files.
+    registryItem.files = registryItem.files.map((file) => {
+      if (file.content?.includes("@/registry/new-york/ui")) {
+        file.content = file.content?.replaceAll(
+          "@/registry/new-york/ui",
+          "@/components/ui"
+        )
+      }
+      return file
+    })
+
     const payload = {
       version: 2,
       payload: registryItem,
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 6709aab1c30..38743749712 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @shadcn/ui
 
+## 0.9.4
+
+### Patch Changes
+
+- [#4397](https://github.com/shadcn-ui/ui/pull/4397) [`a1bed46`](https://github.com/shadcn-ui/ui/commit/a1bed464f329e9025a7fa1ae7dee094d4c9c6f44) Thanks [@JensAstrup](https://github.com/JensAstrup)! - replace lodash.template
+
 ## 0.9.3
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 249e7672e5b..45ed44ee084 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shadcn-ui",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Add components to your apps.",
   "publishConfig": {
     "access": "public"
diff --git a/packages/shadcn/CHANGELOG.md b/packages/shadcn/CHANGELOG.md
index 3ce1a23a311..790713a7b86 100644
--- a/packages/shadcn/CHANGELOG.md
+++ b/packages/shadcn/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @shadcn/ui
 
+## 2.1.7
+
+### Patch Changes
+
+- [#5711](https://github.com/shadcn-ui/ui/pull/5711) [`500dbe2`](https://github.com/shadcn-ui/ui/commit/500dbe2664c04936cc3edb739fc97f6cecff57c5) Thanks [@bcorbold](https://github.com/bcorbold)! - Update spread/unspread helpers to handle ArrayLiteralExpression and nested values within arrays
+
+- [#5678](https://github.com/shadcn-ui/ui/pull/5678) [`fb36ca4`](https://github.com/shadcn-ui/ui/commit/fb36ca41591ae952f3a015e2a4470f26458cf1b5) Thanks [@Tobbe](https://github.com/Tobbe)! - support aliases longer than one char
+
+- [#5813](https://github.com/shadcn-ui/ui/pull/5813) [`d5bf001`](https://github.com/shadcn-ui/ui/commit/d5bf0018fda42faeb314dc3edc87b8cd7c0354c6) Thanks [@shadcn](https://github.com/shadcn)! - fix handling of aliases
+
 ## 2.1.6
 
 ### Patch Changes
diff --git a/packages/shadcn/package.json b/packages/shadcn/package.json
index 55e5f23701f..25e13820533 100644
--- a/packages/shadcn/package.json
+++ b/packages/shadcn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shadcn",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "Add components to your apps.",
   "publishConfig": {
     "access": "public"