diff --git a/.release-plan.json b/.release-plan.json
index 3c289c6ac..2e78c9676 100644
--- a/.release-plan.json
+++ b/.release-plan.json
@@ -1,7 +1,16 @@
 {
   "solution": {
     "@embroider/addon-dev": {
-      "oldVersion": "6.0.0"
+      "impact": "patch",
+      "oldVersion": "6.0.0",
+      "newVersion": "6.0.1",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
+        }
+      ],
+      "pkgJSONPath": "./packages/addon-dev/package.json"
     },
     "@embroider/addon-shim": {
       "oldVersion": "1.8.9"
@@ -9,26 +18,64 @@
     "@embroider/babel-loader-9": {
       "oldVersion": "3.1.1"
     },
+    "@embroider/broccoli-side-watch": {
+      "impact": "major",
+      "oldVersion": "0.1.0",
+      "newVersion": "1.0.0",
+      "constraints": [
+        {
+          "impact": "major",
+          "reason": "Appears in changelog section :boom: Breaking Change"
+        },
+        {
+          "impact": "minor",
+          "reason": "Appears in changelog section :rocket: Enhancement"
+        }
+      ],
+      "pkgJSONPath": "./packages/broccoli-side-watch/package.json"
+    },
     "@embroider/compat": {
       "impact": "patch",
-      "oldVersion": "3.6.2",
-      "newVersion": "3.6.3",
+      "oldVersion": "3.6.3",
+      "newVersion": "3.6.4",
       "constraints": [
         {
           "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
+          "reason": "Has dependency `workspace:*` on @embroider/macros"
         }
       ],
       "pkgJSONPath": "./packages/compat/package.json"
     },
     "@embroider/core": {
-      "oldVersion": "3.4.17"
+      "impact": "patch",
+      "oldVersion": "3.4.17",
+      "newVersion": "3.4.18",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
+        },
+        {
+          "impact": "patch",
+          "reason": "Has dependency `workspace:*` on @embroider/macros"
+        }
+      ],
+      "pkgJSONPath": "./packages/core/package.json"
     },
     "@embroider/hbs-loader": {
       "oldVersion": "3.0.3"
     },
     "@embroider/macros": {
-      "oldVersion": "1.16.7"
+      "impact": "patch",
+      "oldVersion": "1.16.7",
+      "newVersion": "1.16.8",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
+        }
+      ],
+      "pkgJSONPath": "./packages/macros/package.json"
     },
     "@embroider/reverse-exports": {
       "oldVersion": "0.1.0"
@@ -37,7 +84,16 @@
       "oldVersion": "2.1.8"
     },
     "@embroider/shared-internals": {
-      "oldVersion": "2.7.0"
+      "impact": "minor",
+      "oldVersion": "2.7.0",
+      "newVersion": "2.8.0",
+      "constraints": [
+        {
+          "impact": "minor",
+          "reason": "Appears in changelog section :rocket: Enhancement"
+        }
+      ],
+      "pkgJSONPath": "./packages/shared-internals/package.json"
     },
     "@embroider/test-setup": {
       "oldVersion": "4.0.0"
@@ -49,8 +105,17 @@
       "oldVersion": "0.2.1"
     },
     "@embroider/webpack": {
-      "oldVersion": "4.0.6"
+      "impact": "patch",
+      "oldVersion": "4.0.6",
+      "newVersion": "4.0.7",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
+        }
+      ],
+      "pkgJSONPath": "./packages/webpack/package.json"
     }
   },
-  "description": "## Release (2024-10-08)\n\n@embroider/compat 3.6.3 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/compat`, `@embroider/test-scenarios`\n  * [#2133](https://github.com/embroider-build/embroider/pull/2133) fix typescript support for codemod and add option for renaming elements ([@void-mAlex](https://github.com/void-mAlex))\n  * [#2120](https://github.com/embroider-build/embroider/pull/2120) fix gts in v1 addons ([@patricklx](https://github.com/patricklx))\n\n#### :house: Internal\n* `@embroider/test-scenarios`\n  * [#2142](https://github.com/embroider-build/embroider/pull/2142) fixing test suite for ember >= 6 ([@ef4](https://github.com/ef4))\n\n#### Committers: 3\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n- Patrick Pircher ([@patricklx](https://github.com/patricklx))\n"
+  "description": "## Release (2024-10-09)\n\n@embroider/addon-dev 6.0.1 (patch)\n@embroider/broccoli-side-watch 1.0.0 (major)\n@embroider/compat 3.6.4 (patch)\n@embroider/core 3.4.18 (patch)\n@embroider/macros 1.16.8 (patch)\n@embroider/shared-internals 2.8.0 (minor)\n@embroider/webpack 4.0.7 (patch)\n\n#### :boom: Breaking Change\n* `@embroider/broccoli-side-watch`\n  * [#2146](https://github.com/embroider-build/embroider/pull/2146) Fix broccoli-side-watch so release-plan will release as 1.0.0 ([@simonihmig](https://github.com/simonihmig))\n\n#### :rocket: Enhancement\n* `@embroider/broccoli-side-watch`, `@embroider/shared-internals`\n  * [#2141](https://github.com/embroider-build/embroider/pull/2141) Add better broccoli-side-watch package ([@simonihmig](https://github.com/simonihmig))\n\n#### :bug: Bug Fix\n* `@embroider/addon-dev`, `@embroider/test-scenarios`\n  * [#2136](https://github.com/embroider-build/embroider/pull/2136) Enforce correct plugin order in addon-dev  ([@simonihmig](https://github.com/simonihmig))\n\n#### Committers: 1\n- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))\n"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63c1c83fb..bb1afd018 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Embroider Changelog
 
+## Release (2024-10-09)
+
+@embroider/addon-dev 6.0.1 (patch)
+@embroider/broccoli-side-watch 1.0.0 (major)
+@embroider/compat 3.6.4 (patch)
+@embroider/core 3.4.18 (patch)
+@embroider/macros 1.16.8 (patch)
+@embroider/shared-internals 2.8.0 (minor)
+@embroider/webpack 4.0.7 (patch)
+
+#### :boom: Breaking Change
+* `@embroider/broccoli-side-watch`
+  * [#2146](https://github.com/embroider-build/embroider/pull/2146) Fix broccoli-side-watch so release-plan will release as 1.0.0 ([@simonihmig](https://github.com/simonihmig))
+
+#### :rocket: Enhancement
+* `@embroider/broccoli-side-watch`, `@embroider/shared-internals`
+  * [#2141](https://github.com/embroider-build/embroider/pull/2141) Add better broccoli-side-watch package ([@simonihmig](https://github.com/simonihmig))
+
+#### :bug: Bug Fix
+* `@embroider/addon-dev`, `@embroider/test-scenarios`
+  * [#2136](https://github.com/embroider-build/embroider/pull/2136) Enforce correct plugin order in addon-dev  ([@simonihmig](https://github.com/simonihmig))
+
+#### Committers: 1
+- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
+
 ## Release (2024-10-08)
 
 @embroider/compat 3.6.3 (patch)
diff --git a/packages/addon-dev/package.json b/packages/addon-dev/package.json
index 5190fcf06..a481ae2e4 100644
--- a/packages/addon-dev/package.json
+++ b/packages/addon-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/addon-dev",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Utilities for addon authors",
   "repository": {
     "type": "git",
diff --git a/packages/broccoli-side-watch/package.json b/packages/broccoli-side-watch/package.json
index ba8022e8b..bcae46011 100644
--- a/packages/broccoli-side-watch/package.json
+++ b/packages/broccoli-side-watch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/broccoli-side-watch",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Watch changes in other folders to rebuild Ember app",
   "keywords": [
     "ember"
diff --git a/packages/compat/package.json b/packages/compat/package.json
index bb54c2dd5..3d1ab6ebc 100644
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
diff --git a/packages/core/package.json b/packages/core/package.json
index b3200a523..77c7899a1 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.17",
+  "version": "3.4.18",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
diff --git a/packages/macros/package.json b/packages/macros/package.json
index 027ac6c56..10d12a3ae 100644
--- a/packages/macros/package.json
+++ b/packages/macros/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/macros",
-  "version": "1.16.7",
+  "version": "1.16.8",
   "private": false,
   "description": "Standardized build-time macros for ember apps.",
   "keywords": [
diff --git a/packages/shared-internals/package.json b/packages/shared-internals/package.json
index ad5a04396..fe9af9d48 100644
--- a/packages/shared-internals/package.json
+++ b/packages/shared-internals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/shared-internals",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "private": false,
   "description": "Utilities shared among the other embroider packages",
   "repository": {
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 9e7c94097..989fe5d1b 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/webpack",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "private": false,
   "description": "Builds EmberJS apps with Webpack",
   "repository": {