diff --git a/.release-plan.json b/.release-plan.json
index b952ce76f..d6f01ed83 100644
--- a/.release-plan.json
+++ b/.release-plan.json
@@ -10,33 +10,16 @@
       "oldVersion": "3.1.1"
     },
     "@embroider/compat": {
-      "impact": "patch",
-      "oldVersion": "3.6.0",
-      "newVersion": "3.6.1",
-      "constraints": [
-        {
-          "impact": "patch",
-          "reason": "Has dependency `workspace:*` on @embroider/macros"
-        },
-        {
-          "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
-        }
-      ],
-      "pkgJSONPath": "./packages/compat/package.json"
+      "oldVersion": "3.6.1"
     },
     "@embroider/core": {
       "impact": "patch",
-      "oldVersion": "3.4.14",
-      "newVersion": "3.4.15",
+      "oldVersion": "3.4.15",
+      "newVersion": "3.4.16",
       "constraints": [
         {
           "impact": "patch",
-          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
-        },
-        {
-          "impact": "patch",
-          "reason": "Has dependency `workspace:*` on @embroider/macros"
+          "reason": "Appears in changelog section :bug: Bug Fix"
         }
       ],
       "pkgJSONPath": "./packages/core/package.json"
@@ -45,16 +28,7 @@
       "oldVersion": "3.0.3"
     },
     "@embroider/macros": {
-      "impact": "patch",
-      "oldVersion": "1.16.5",
-      "newVersion": "1.16.6",
-      "constraints": [
-        {
-          "impact": "patch",
-          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
-        }
-      ],
-      "pkgJSONPath": "./packages/macros/package.json"
+      "oldVersion": "1.16.6"
     },
     "@embroider/reverse-exports": {
       "oldVersion": "0.1.0"
@@ -63,16 +37,7 @@
       "oldVersion": "2.1.8"
     },
     "@embroider/shared-internals": {
-      "impact": "patch",
-      "oldVersion": "2.6.2",
-      "newVersion": "2.6.3",
-      "constraints": [
-        {
-          "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
-        }
-      ],
-      "pkgJSONPath": "./packages/shared-internals/package.json"
+      "oldVersion": "2.6.3"
     },
     "@embroider/test-setup": {
       "oldVersion": "4.0.0"
@@ -84,21 +49,8 @@
       "oldVersion": "0.2.0"
     },
     "@embroider/webpack": {
-      "impact": "patch",
-      "oldVersion": "4.0.4",
-      "newVersion": "4.0.5",
-      "constraints": [
-        {
-          "impact": "patch",
-          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
-        },
-        {
-          "impact": "patch",
-          "reason": "Appears in changelog section :house: Internal"
-        }
-      ],
-      "pkgJSONPath": "./packages/webpack/package.json"
+      "oldVersion": "4.0.5"
     }
   },
-  "description": "## Release (2024-08-30)\n\n@embroider/compat 3.6.1 (patch)\n@embroider/core 3.4.15 (patch)\n@embroider/macros 1.16.6 (patch)\n@embroider/shared-internals 2.6.3 (patch)\n@embroider/webpack 4.0.5 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/shared-internals`\n  * [#2075](https://github.com/embroider-build/embroider/pull/2075) Update ember standard modules to include @ember/renderer and @ember/-internals and ember-testing ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n* `@embroider/compat`\n  * [#2067](https://github.com/embroider-build/embroider/pull/2067) codemod fixes ([@void-mAlex](https://github.com/void-mAlex))\n\n#### :memo: Documentation\n* [#2055](https://github.com/embroider-build/embroider/pull/2055) document templateTagCodemod usage ([@void-mAlex](https://github.com/void-mAlex))\n\n#### :house: Internal\n* `@embroider/webpack`\n  * [#2076](https://github.com/embroider-build/embroider/pull/2076) [Stable]: Follow upstream type change from webpack ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n* Other\n  * [#2058](https://github.com/embroider-build/embroider/pull/2058) Set the packageManager field ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 2\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
+  "description": "## Release (2024-09-20)\n\n@embroider/core 3.4.16 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/core`, `@embroider/test-scenarios`\n  * [#2088](https://github.com/embroider-build/embroider/pull/2088) Implement ember's component-template-resolving deprecation ([@ef4](https://github.com/ef4))\n\n#### Committers: 1\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ffd05cd2..efec08c5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Embroider Changelog
 
+## Release (2024-09-20)
+
+@embroider/core 3.4.16 (patch)
+
+#### :bug: Bug Fix
+* `@embroider/core`, `@embroider/test-scenarios`
+  * [#2088](https://github.com/embroider-build/embroider/pull/2088) Implement ember's component-template-resolving deprecation ([@ef4](https://github.com/ef4))
+
+#### Committers: 1
+- Edward Faulkner ([@ef4](https://github.com/ef4))
+
 ## Release (2024-08-30)
 
 @embroider/compat 3.6.1 (patch)
diff --git a/packages/core/package.json b/packages/core/package.json
index 299b93112..b78f0b0cd 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.15",
+  "version": "3.4.16",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {