diff --git a/.release-plan.json b/.release-plan.json
index f71132946..5da81699a 100644
--- a/.release-plan.json
+++ b/.release-plan.json
@@ -10,28 +10,50 @@
       "oldVersion": "3.1.1"
     },
     "@embroider/broccoli-side-watch": {
+      "oldVersion": "1.0.1"
+    },
+    "@embroider/compat": {
       "impact": "patch",
-      "oldVersion": "1.0.0",
-      "newVersion": "1.0.1",
+      "oldVersion": "3.6.4",
+      "newVersion": "3.6.5",
       "constraints": [
         {
           "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
+          "reason": "Has dependency `workspace:*` on @embroider/macros"
         }
       ],
-      "pkgJSONPath": "./packages/broccoli-side-watch/package.json"
-    },
-    "@embroider/compat": {
-      "oldVersion": "3.6.4"
+      "pkgJSONPath": "./packages/compat/package.json"
     },
     "@embroider/core": {
-      "oldVersion": "3.4.18"
+      "impact": "patch",
+      "oldVersion": "3.4.18",
+      "newVersion": "3.4.19",
+      "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.8"
+      "impact": "patch",
+      "oldVersion": "1.16.8",
+      "newVersion": "1.16.9",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
+        }
+      ],
+      "pkgJSONPath": "./packages/macros/package.json"
     },
     "@embroider/reverse-exports": {
       "oldVersion": "0.1.0"
@@ -40,7 +62,16 @@
       "oldVersion": "2.1.8"
     },
     "@embroider/shared-internals": {
-      "oldVersion": "2.8.0"
+      "impact": "patch",
+      "oldVersion": "2.8.0",
+      "newVersion": "2.8.1",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
+        }
+      ],
+      "pkgJSONPath": "./packages/shared-internals/package.json"
     },
     "@embroider/test-setup": {
       "oldVersion": "4.0.0"
@@ -52,8 +83,17 @@
       "oldVersion": "0.2.1"
     },
     "@embroider/webpack": {
-      "oldVersion": "4.0.7"
+      "impact": "patch",
+      "oldVersion": "4.0.7",
+      "newVersion": "4.0.8",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
+        }
+      ],
+      "pkgJSONPath": "./packages/webpack/package.json"
     }
   },
-  "description": "## Release (2024-10-09)\n\n@embroider/broccoli-side-watch 1.0.1 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/broccoli-side-watch`\n  * [#2148](https://github.com/embroider-build/embroider/pull/2148) Fix broken default export when required from CJS ([@simonihmig](https://github.com/simonihmig))\n\n#### Committers: 1\n- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))\n"
+  "description": "## Release (2024-10-09)\n\n@embroider/compat 3.6.5 (patch)\n@embroider/core 3.4.19 (patch)\n@embroider/macros 1.16.9 (patch)\n@embroider/shared-internals 2.8.1 (patch)\n@embroider/webpack 4.0.8 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/shared-internals`\n  * [#2151](https://github.com/embroider-build/embroider/pull/2151) Fix hbs plugin not resolving .hbs due to broken Regex ([@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 aadf76d52..3f772f243 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 ## Release (2024-10-09)
 
+@embroider/compat 3.6.5 (patch)
+@embroider/core 3.4.19 (patch)
+@embroider/macros 1.16.9 (patch)
+@embroider/shared-internals 2.8.1 (patch)
+@embroider/webpack 4.0.8 (patch)
+
+#### :bug: Bug Fix
+* `@embroider/shared-internals`
+  * [#2151](https://github.com/embroider-build/embroider/pull/2151) Fix hbs plugin not resolving .hbs due to broken Regex ([@simonihmig](https://github.com/simonihmig))
+
+#### Committers: 1
+- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
+
+## Release (2024-10-09)
+
 @embroider/broccoli-side-watch 1.0.1 (patch)
 
 #### :bug: Bug Fix
diff --git a/packages/compat/package.json b/packages/compat/package.json
index 3d1ab6ebc..44e5b7cb5 100644
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "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 77c7899a1..32614b34c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.18",
+  "version": "3.4.19",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
diff --git a/packages/macros/package.json b/packages/macros/package.json
index 10d12a3ae..655c4a113 100644
--- a/packages/macros/package.json
+++ b/packages/macros/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/macros",
-  "version": "1.16.8",
+  "version": "1.16.9",
   "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 fe9af9d48..d5c906999 100644
--- a/packages/shared-internals/package.json
+++ b/packages/shared-internals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/shared-internals",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "private": false,
   "description": "Utilities shared among the other embroider packages",
   "repository": {
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 989fe5d1b..e2b8272c2 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/webpack",
-  "version": "4.0.7",
+  "version": "4.0.8",
   "private": false,
   "description": "Builds EmberJS apps with Webpack",
   "repository": {