diff --git a/.changeset/smart-penguins-enjoy.md b/.changeset/smart-penguins-enjoy.md
deleted file mode 100644
index a0183cfc..00000000
--- a/.changeset/smart-penguins-enjoy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@tanstack/cli": patch
----
-
-Add compatibility handling for legacy `--router-only` and `--template` create flags, including clear deprecation warnings and explicit errors for unsupported JavaScript templates.
diff --git a/cli-aliases/create-start-app/CHANGELOG.md b/cli-aliases/create-start-app/CHANGELOG.md
index fb17a8b8..605a6530 100644
--- a/cli-aliases/create-start-app/CHANGELOG.md
+++ b/cli-aliases/create-start-app/CHANGELOG.md
@@ -1,5 +1,12 @@
 # create-start-app
 
+## 0.58.4
+
+### Patch Changes
+
+- Updated dependencies [[`0c0ee31`](https://github.com/TanStack/cli/commit/0c0ee318f78896f228623aa05e2a58cfb50e6f81)]:
+  - @tanstack/cli@0.58.4
+
 ## 0.58.3
 
 ### Patch Changes
diff --git a/cli-aliases/create-start-app/package.json b/cli-aliases/create-start-app/package.json
index a4073fd9..2eea747f 100644
--- a/cli-aliases/create-start-app/package.json
+++ b/cli-aliases/create-start-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-start-app",
-  "version": "0.58.3",
+  "version": "0.58.4",
   "description": "Tanstack Start Builder",
   "bin": "./dist/index.js",
   "type": "module",
diff --git a/cli-aliases/create-tanstack-app/CHANGELOG.md b/cli-aliases/create-tanstack-app/CHANGELOG.md
index 01c55dc3..17489009 100644
--- a/cli-aliases/create-tanstack-app/CHANGELOG.md
+++ b/cli-aliases/create-tanstack-app/CHANGELOG.md
@@ -1,5 +1,12 @@
 # create-tanstack-app
 
+## 0.53.4
+
+### Patch Changes
+
+- Updated dependencies [[`0c0ee31`](https://github.com/TanStack/cli/commit/0c0ee318f78896f228623aa05e2a58cfb50e6f81)]:
+  - @tanstack/cli@0.58.4
+
 ## 0.53.3
 
 ### Patch Changes
diff --git a/cli-aliases/create-tanstack-app/package.json b/cli-aliases/create-tanstack-app/package.json
index a9b7cd64..293501f0 100644
--- a/cli-aliases/create-tanstack-app/package.json
+++ b/cli-aliases/create-tanstack-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-tanstack-app",
-  "version": "0.53.3",
+  "version": "0.53.4",
   "description": "Tanstack Application Builder",
   "bin": "./dist/index.js",
   "type": "module",
diff --git a/cli-aliases/create-tanstack/CHANGELOG.md b/cli-aliases/create-tanstack/CHANGELOG.md
index 217453ff..23bdc5eb 100644
--- a/cli-aliases/create-tanstack/CHANGELOG.md
+++ b/cli-aliases/create-tanstack/CHANGELOG.md
@@ -1,5 +1,12 @@
 # create-tanstack
 
+## 0.53.4
+
+### Patch Changes
+
+- Updated dependencies [[`0c0ee31`](https://github.com/TanStack/cli/commit/0c0ee318f78896f228623aa05e2a58cfb50e6f81)]:
+  - @tanstack/cli@0.58.4
+
 ## 0.53.3
 
 ### Patch Changes
diff --git a/cli-aliases/create-tanstack/package.json b/cli-aliases/create-tanstack/package.json
index 47ded78a..415cb997 100644
--- a/cli-aliases/create-tanstack/package.json
+++ b/cli-aliases/create-tanstack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-tanstack",
-  "version": "0.53.3",
+  "version": "0.53.4",
   "description": "Tanstack Application Builder",
   "bin": "./dist/index.js",
   "type": "module",
diff --git a/cli-aliases/create-tsrouter-app/CHANGELOG.md b/cli-aliases/create-tsrouter-app/CHANGELOG.md
index b939d72d..2b1b26de 100644
--- a/cli-aliases/create-tsrouter-app/CHANGELOG.md
+++ b/cli-aliases/create-tsrouter-app/CHANGELOG.md
@@ -1,5 +1,12 @@
 # create-tsrouter-app
 
+## 0.53.4
+
+### Patch Changes
+
+- Updated dependencies [[`0c0ee31`](https://github.com/TanStack/cli/commit/0c0ee318f78896f228623aa05e2a58cfb50e6f81)]:
+  - @tanstack/cli@0.58.4
+
 ## 0.53.3
 
 ### Patch Changes
diff --git a/cli-aliases/create-tsrouter-app/package.json b/cli-aliases/create-tsrouter-app/package.json
index fbc50abf..2b55a545 100644
--- a/cli-aliases/create-tsrouter-app/package.json
+++ b/cli-aliases/create-tsrouter-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-tsrouter-app",
-  "version": "0.53.3",
+  "version": "0.53.4",
   "description": "Tanstack Application Builder",
   "bin": "./dist/index.js",
   "type": "module",
diff --git a/cli-aliases/ts-create-start/CHANGELOG.md b/cli-aliases/ts-create-start/CHANGELOG.md
index 041bef3c..04ef0bf8 100644
--- a/cli-aliases/ts-create-start/CHANGELOG.md
+++ b/cli-aliases/ts-create-start/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @tanstack/create-start
 
+## 0.58.4
+
+### Patch Changes
+
+- Updated dependencies [[`0c0ee31`](https://github.com/TanStack/cli/commit/0c0ee318f78896f228623aa05e2a58cfb50e6f81)]:
+  - @tanstack/cli@0.58.4
+
 ## 0.58.3
 
 ### Patch Changes
diff --git a/cli-aliases/ts-create-start/package.json b/cli-aliases/ts-create-start/package.json
index cd4d9a89..ed377245 100644
--- a/cli-aliases/ts-create-start/package.json
+++ b/cli-aliases/ts-create-start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/create-start",
-  "version": "0.58.3",
+  "version": "0.58.4",
   "description": "Tanstack Start Builder",
   "bin": "./dist/index.js",
   "type": "module",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index b9363b5f..c295d09c 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tanstack/cli
 
+## 0.58.4
+
+### Patch Changes
+
+- Add compatibility handling for legacy `--router-only` and `--template` create flags, including clear deprecation warnings and explicit errors for unsupported JavaScript templates. ([`0c0ee31`](https://github.com/TanStack/cli/commit/0c0ee318f78896f228623aa05e2a58cfb50e6f81))
+
 ## 0.58.3
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index e0f36ae4..265738ef 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/cli",
-  "version": "0.58.3",
+  "version": "0.58.4",
   "description": "TanStack CLI",
   "type": "module",
   "main": "./dist/index.js",