diff --git a/.release-plan.json b/.release-plan.json
index 0b742f942..7b8d10b73 100644
--- a/.release-plan.json
+++ b/.release-plan.json
@@ -4,55 +4,55 @@
       "oldVersion": "4.3.1"
     },
     "@embroider/addon-shim": {
-      "oldVersion": "1.8.7"
+      "impact": "patch",
+      "oldVersion": "1.8.7",
+      "newVersion": "1.8.8",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
+        }
+      ],
+      "pkgJSONPath": "./packages/addon-shim/package.json"
     },
     "@embroider/babel-loader-9": {
       "oldVersion": "3.1.1"
     },
     "@embroider/compat": {
-      "impact": "patch",
-      "oldVersion": "3.4.8",
-      "newVersion": "3.4.9",
+      "impact": "minor",
+      "oldVersion": "3.4.9",
+      "newVersion": "3.5.0",
       "constraints": [
         {
-          "impact": "patch",
-          "reason": "Has dependency `workspace:*` on @embroider/macros"
+          "impact": "minor",
+          "reason": "Appears in changelog section :rocket: Enhancement"
         }
       ],
       "pkgJSONPath": "./packages/compat/package.json"
     },
     "@embroider/core": {
-      "impact": "patch",
-      "oldVersion": "3.4.8",
-      "newVersion": "3.4.9",
-      "constraints": [
-        {
-          "impact": "patch",
-          "reason": "Has dependency `workspace:*` on @embroider/macros"
-        }
-      ],
-      "pkgJSONPath": "./packages/core/package.json"
+      "oldVersion": "3.4.9"
     },
     "@embroider/hbs-loader": {
       "oldVersion": "3.0.3"
     },
     "@embroider/macros": {
+      "oldVersion": "1.16.1"
+    },
+    "@embroider/reverse-exports": {
+      "oldVersion": "0.1.0"
+    },
+    "@embroider/router": {
       "impact": "patch",
-      "oldVersion": "1.16.0",
-      "newVersion": "1.16.1",
+      "oldVersion": "2.1.6",
+      "newVersion": "2.1.7",
       "constraints": [
         {
           "impact": "patch",
           "reason": "Appears in changelog section :bug: Bug Fix"
         }
       ],
-      "pkgJSONPath": "./packages/macros/package.json"
-    },
-    "@embroider/reverse-exports": {
-      "oldVersion": "0.1.0"
-    },
-    "@embroider/router": {
-      "oldVersion": "2.1.6"
+      "pkgJSONPath": "./packages/router/package.json"
     },
     "@embroider/shared-internals": {
       "oldVersion": "2.6.0"
@@ -61,16 +61,7 @@
       "oldVersion": "4.0.0"
     },
     "@embroider/util": {
-      "impact": "patch",
-      "oldVersion": "1.13.0",
-      "newVersion": "1.13.1",
-      "constraints": [
-        {
-          "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
-        }
-      ],
-      "pkgJSONPath": "./packages/util/package.json"
+      "oldVersion": "1.13.1"
     },
     "@embroider/vite": {
       "oldVersion": "0.2.0"
@@ -79,5 +70,5 @@
       "oldVersion": "4.0.0"
     }
   },
-  "description": "## Release (2024-04-30)\n\n@embroider/compat 3.4.9 (patch)\n@embroider/core 3.4.9 (patch)\n@embroider/macros 1.16.1 (patch)\n@embroider/util 1.13.1 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/macros`, `@embroider/util`\n  * [#1891](https://github.com/embroider-build/embroider/pull/1891) Revert \"Update to `ember-cli-babel` v8\" ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n"
+  "description": "## Release (2024-05-08)\n\n@embroider/addon-shim 1.8.8 (patch)\n@embroider/compat 3.5.0 (minor)\n@embroider/router 2.1.7 (patch)\n\n#### :rocket: Enhancement\n* `@embroider/compat`\n  * [#1907](https://github.com/embroider-build/embroider/pull/1907) Make ember-source compat adapter tolerant of upcoming ember-source changes ([@ef4](https://github.com/ef4))\n\n#### :bug: Bug Fix\n* `@embroider/router`\n  * [#1904](https://github.com/embroider-build/embroider/pull/1904) Fix getRoute override ([@jembezmamy](https://github.com/jembezmamy))\n* `@embroider/addon-shim`\n  * [#1901](https://github.com/embroider-build/embroider/pull/1901) [addon-shim]: Narrowed down broccoli trees for optimized file watching ([@simonihmig](https://github.com/simonihmig))\n\n#### :house: Internal\n* `@embroider/test-scenarios`\n  * [#1908](https://github.com/embroider-build/embroider/pull/1908) update tests to follow newer babel-plugin-ember-template-compiilation ([@ef4](https://github.com/ef4))\n\n#### Committers: 3\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n- Paweł Bator ([@jembezmamy](https://github.com/jembezmamy))\n- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))\n"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce438af28..245241147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Embroider Changelog
 
+## Release (2024-05-08)
+
+@embroider/addon-shim 1.8.8 (patch)
+@embroider/compat 3.5.0 (minor)
+@embroider/router 2.1.7 (patch)
+
+#### :rocket: Enhancement
+* `@embroider/compat`
+  * [#1907](https://github.com/embroider-build/embroider/pull/1907) Make ember-source compat adapter tolerant of upcoming ember-source changes ([@ef4](https://github.com/ef4))
+
+#### :bug: Bug Fix
+* `@embroider/router`
+  * [#1904](https://github.com/embroider-build/embroider/pull/1904) Fix getRoute override ([@jembezmamy](https://github.com/jembezmamy))
+* `@embroider/addon-shim`
+  * [#1901](https://github.com/embroider-build/embroider/pull/1901) [addon-shim]: Narrowed down broccoli trees for optimized file watching ([@simonihmig](https://github.com/simonihmig))
+
+#### :house: Internal
+* `@embroider/test-scenarios`
+  * [#1908](https://github.com/embroider-build/embroider/pull/1908) update tests to follow newer babel-plugin-ember-template-compiilation ([@ef4](https://github.com/ef4))
+
+#### Committers: 3
+- Edward Faulkner ([@ef4](https://github.com/ef4))
+- Paweł Bator ([@jembezmamy](https://github.com/jembezmamy))
+- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
+
 ## Release (2024-04-30)
 
 @embroider/compat 3.4.9 (patch)
diff --git a/packages/addon-shim/package.json b/packages/addon-shim/package.json
index 23cab53e8..fe39df8a3 100644
--- a/packages/addon-shim/package.json
+++ b/packages/addon-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/addon-shim",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "description": "Make v2 addons work in non-Embroider apps.",
   "keywords": [],
   "main": "./src/index.js",
diff --git a/packages/compat/package.json b/packages/compat/package.json
index 81559768e..7296a6db7 100644
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.4.9",
+  "version": "3.5.0",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
diff --git a/packages/router/package.json b/packages/router/package.json
index b81d2d7e8..c8914916e 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/router",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "Lazy loading router",
   "keywords": [
     "ember-addon"