diff --git a/.release-plan.json b/.release-plan.json
index f7f629a20..5ae760fdd 100644
--- a/.release-plan.json
+++ b/.release-plan.json
@@ -1,94 +1,175 @@
 {
   "solution": {
     "@embroider/addon-dev": {
-      "oldVersion": "3.1.1"
+      "impact": "patch",
+      "oldVersion": "3.1.1",
+      "newVersion": "3.1.2",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
+        }
+      ],
+      "pkgJSONPath": "packages/addon-dev/package.json"
     },
     "@embroider/addon-shim": {
-      "oldVersion": "1.8.5"
+      "impact": "patch",
+      "oldVersion": "1.8.5",
+      "newVersion": "1.8.6",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
+        }
+      ],
+      "pkgJSONPath": "packages/addon-shim/package.json"
     },
     "@embroider/babel-loader-8": {
       "oldVersion": "3.0.0"
     },
     "@embroider/compat": {
       "impact": "patch",
-      "oldVersion": "3.1.3",
-      "newVersion": "3.1.4",
+      "oldVersion": "3.1.4",
+      "newVersion": "3.1.5",
       "constraints": [
         {
           "impact": "patch",
           "reason": "Has dependency `workspace:*` on @embroider/macros"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
         }
       ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/compat/package.json"
+      "pkgJSONPath": "packages/compat/package.json"
     },
     "@embroider/core": {
       "impact": "patch",
-      "oldVersion": "3.1.1",
-      "newVersion": "3.1.2",
+      "oldVersion": "3.1.2",
+      "newVersion": "3.1.3",
       "constraints": [
         {
           "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
+          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
         },
         {
           "impact": "patch",
-          "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
+          "reason": "Has dependency `workspace:*` on @embroider/macros"
         },
         {
           "impact": "patch",
-          "reason": "Has dependency `workspace:*` on @embroider/macros"
+          "reason": "Appears in changelog section :bug: Bug Fix"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
         }
       ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/core/package.json"
+      "pkgJSONPath": "packages/core/package.json"
     },
     "@embroider/hbs-loader": {
-      "oldVersion": "3.0.0"
+      "impact": "patch",
+      "oldVersion": "3.0.0",
+      "newVersion": "3.0.1",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
+        }
+      ],
+      "pkgJSONPath": "packages/hbs-loader/package.json"
     },
     "@embroider/macros": {
       "impact": "patch",
-      "oldVersion": "1.12.1",
-      "newVersion": "1.12.2",
+      "oldVersion": "1.12.2",
+      "newVersion": "1.12.3",
       "constraints": [
         {
           "impact": "patch",
           "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :memo: Documentation"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
         }
       ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/macros/package.json"
+      "pkgJSONPath": "packages/macros/package.json"
     },
     "@embroider/router": {
-      "oldVersion": "2.1.2"
+      "impact": "patch",
+      "oldVersion": "2.1.2",
+      "newVersion": "2.1.3",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
+        }
+      ],
+      "pkgJSONPath": "packages/router/package.json"
     },
     "@embroider/shared-internals": {
       "impact": "patch",
-      "oldVersion": "2.2.1",
-      "newVersion": "2.2.2",
+      "oldVersion": "2.2.2",
+      "newVersion": "2.2.3",
       "constraints": [
         {
           "impact": "patch",
           "reason": "Appears in changelog section :bug: Bug Fix"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
         }
       ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/shared-internals/package.json"
+      "pkgJSONPath": "packages/shared-internals/package.json"
     },
     "@embroider/test-setup": {
       "oldVersion": "3.0.1"
     },
     "@embroider/util": {
-      "oldVersion": "1.11.1"
+      "impact": "patch",
+      "oldVersion": "1.11.1",
+      "newVersion": "1.11.2",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
+        }
+      ],
+      "pkgJSONPath": "packages/util/package.json"
     },
     "@embroider/webpack": {
       "impact": "patch",
-      "oldVersion": "3.1.1",
-      "newVersion": "3.1.2",
+      "oldVersion": "3.1.2",
+      "newVersion": "3.1.3",
       "constraints": [
         {
           "impact": "patch",
           "reason": "Has dependency `workspace:*` on @embroider/shared-internals"
+        },
+        {
+          "impact": "patch",
+          "reason": "Has dependency `workspace:*` on @embroider/hbs-loader"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :house: Internal"
         }
       ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/webpack/package.json"
+      "pkgJSONPath": "packages/webpack/package.json"
     }
   },
-  "description": "## Release (2023-07-01)\n\n@embroider/compat 3.1.4 (patch)\n@embroider/core 3.1.2 (patch)\n@embroider/macros 1.12.2 (patch)\n@embroider/shared-internals 2.2.2 (patch)\n@embroider/webpack 3.1.2 (patch)\n\n#### :bug: Bug Fix\n* `core`\n  * [#1504](https://github.com/embroider-build/embroider/pull/1504) fix inter-package relative imports in addon's app-js ([@ef4](https://github.com/ef4))\n* `shared-internals`\n  * [#1503](https://github.com/embroider-build/embroider/pull/1503) less aggressive realpathSync ([@ef4](https://github.com/ef4))\n\n#### :house: Internal\n* [#1502](https://github.com/embroider-build/embroider/pull/1502) re-enabling ember 5.1 tests ([@ef4](https://github.com/ef4))\n\n#### Committers: 1\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n"
+  "description": "## Release (2023-07-13)\n\n@embroider/addon-dev 3.1.2 (patch)\n@embroider/addon-shim 1.8.6 (patch)\n@embroider/compat 3.1.5 (patch)\n@embroider/core 3.1.3 (patch)\n@embroider/hbs-loader 3.0.1 (patch)\n@embroider/macros 1.12.3 (patch)\n@embroider/router 2.1.3 (patch)\n@embroider/shared-internals 2.2.3 (patch)\n@embroider/util 1.11.2 (patch)\n@embroider/webpack 3.1.3 (patch)\n\n#### :bug: Bug Fix\n* `shared-internals`\n  * [#1516](https://github.com/embroider-build/embroider/pull/1516) Move @embroider/macros from emberVirtualPackages to emberVirtualPeerDeps ([@ef4](https://github.com/ef4))\n  * [#1513](https://github.com/embroider-build/embroider/pull/1513) Add `@glimmer/reference` as a virtual package ([@chancancode](https://github.com/chancancode))\n* Other\n  * [#1528](https://github.com/embroider-build/embroider/pull/1528) Restore older node support ([@ef4](https://github.com/ef4))\n* `core`\n  * [#1524](https://github.com/embroider-build/embroider/pull/1524) Fix the `EMBROIDER_CONCAT_STATS` build error ([@Windvis](https://github.com/Windvis))\n  * [#1509](https://github.com/embroider-build/embroider/pull/1509) All addons may need emberVirtualPeerDep handling ([@ef4](https://github.com/ef4))\n* `addon-dev`, `macros`\n  * [#1520](https://github.com/embroider-build/embroider/pull/1520) use transform babel plugins instead of proposal ([@mansona](https://github.com/mansona))\n\n#### :memo: Documentation\n* `macros`\n  * [#1507](https://github.com/embroider-build/embroider/pull/1507) fix(macros-readme): fix isTesting, isDevelopingApp typos ([@olenderhub](https://github.com/olenderhub))\n\n#### :house: Internal\n* `compat`\n  * [#1522](https://github.com/embroider-build/embroider/pull/1522) format resolver.json more nicely ([@ef4](https://github.com/ef4))\n* Other\n  * [#1500](https://github.com/embroider-build/embroider/pull/1500) Make the package-json path repo-relative ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n* `addon-dev`, `addon-shim`, `compat`, `core`, `hbs-loader`, `macros`, `router`, `shared-internals`, `util`, `webpack`\n  * [#1512](https://github.com/embroider-build/embroider/pull/1512) Upgrade typescript ([@ef4](https://github.com/ef4))\n* `router`\n  * [#1510](https://github.com/embroider-build/embroider/pull/1510) Replace rollup-plugin-ts with @rollup/plugin-typescript ([@ef4](https://github.com/ef4))\n\n#### Committers: 6\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n- Godfrey Chan ([@chancancode](https://github.com/chancancode))\n- Hubert Olender ([@olenderhub](https://github.com/olenderhub))\n- Sam Van Campenhout ([@Windvis](https://github.com/Windvis))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 402f88056..a0abe9e90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,51 @@
 # Embroider Changelog
 
+## Release (2023-07-13)
+
+@embroider/addon-dev 3.1.2 (patch)
+@embroider/addon-shim 1.8.6 (patch)
+@embroider/compat 3.1.5 (patch)
+@embroider/core 3.1.3 (patch)
+@embroider/hbs-loader 3.0.1 (patch)
+@embroider/macros 1.12.3 (patch)
+@embroider/router 2.1.3 (patch)
+@embroider/shared-internals 2.2.3 (patch)
+@embroider/util 1.11.2 (patch)
+@embroider/webpack 3.1.3 (patch)
+
+#### :bug: Bug Fix
+* `shared-internals`
+  * [#1516](https://github.com/embroider-build/embroider/pull/1516) Move @embroider/macros from emberVirtualPackages to emberVirtualPeerDeps ([@ef4](https://github.com/ef4))
+  * [#1513](https://github.com/embroider-build/embroider/pull/1513) Add `@glimmer/reference` as a virtual package ([@chancancode](https://github.com/chancancode))
+  * [#1528](https://github.com/embroider-build/embroider/pull/1528) Restore older node support ([@ef4](https://github.com/ef4))
+* `core`
+  * [#1524](https://github.com/embroider-build/embroider/pull/1524) Fix the `EMBROIDER_CONCAT_STATS` build error ([@Windvis](https://github.com/Windvis))
+  * [#1509](https://github.com/embroider-build/embroider/pull/1509) All addons may need emberVirtualPeerDep handling ([@ef4](https://github.com/ef4))
+* `addon-dev`, `macros`
+  * [#1520](https://github.com/embroider-build/embroider/pull/1520) use transform babel plugins instead of proposal ([@mansona](https://github.com/mansona))
+
+#### :memo: Documentation
+* `macros`
+  * [#1507](https://github.com/embroider-build/embroider/pull/1507) fix(macros-readme): fix isTesting, isDevelopingApp typos ([@olenderhub](https://github.com/olenderhub))
+
+#### :house: Internal
+* `compat`
+  * [#1522](https://github.com/embroider-build/embroider/pull/1522) format resolver.json more nicely ([@ef4](https://github.com/ef4))
+* Other
+  * [#1500](https://github.com/embroider-build/embroider/pull/1500) Make the package-json path repo-relative ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+* `addon-dev`, `addon-shim`, `compat`, `core`, `hbs-loader`, `macros`, `router`, `shared-internals`, `util`, `webpack`
+  * [#1512](https://github.com/embroider-build/embroider/pull/1512) Upgrade typescript ([@ef4](https://github.com/ef4))
+* `router`
+  * [#1510](https://github.com/embroider-build/embroider/pull/1510) Replace rollup-plugin-ts with @rollup/plugin-typescript ([@ef4](https://github.com/ef4))
+
+#### Committers: 6
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Edward Faulkner ([@ef4](https://github.com/ef4))
+- Godfrey Chan ([@chancancode](https://github.com/chancancode))
+- Hubert Olender ([@olenderhub](https://github.com/olenderhub))
+- Sam Van Campenhout ([@Windvis](https://github.com/Windvis))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## Release (2023-07-01)
 
 @embroider/compat 3.1.4 (patch)
diff --git a/packages/addon-dev/package.json b/packages/addon-dev/package.json
index f9c6cf87b..da3d1c3ae 100644
--- a/packages/addon-dev/package.json
+++ b/packages/addon-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/addon-dev",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Utilities for addon authors",
   "repository": {
     "type": "git",
diff --git a/packages/addon-shim/package.json b/packages/addon-shim/package.json
index 39707aa39..9a4ee299e 100644
--- a/packages/addon-shim/package.json
+++ b/packages/addon-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/addon-shim",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "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 89678d9c9..8c5f76be5 100644
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.1.4",
+  "version": "3.1.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 9adfb81ac..3c64fcf36 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -70,4 +70,4 @@
   "volta": {
     "extends": "../../package.json"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/hbs-loader/package.json b/packages/hbs-loader/package.json
index 1b0a6265a..10e6410cd 100644
--- a/packages/hbs-loader/package.json
+++ b/packages/hbs-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/hbs-loader",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "private": false,
   "description": "Glimmer handlebars loader for webpack",
   "repository": {
diff --git a/packages/macros/package.json b/packages/macros/package.json
index 341326dce..98bd6c6bd 100644
--- a/packages/macros/package.json
+++ b/packages/macros/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/macros",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "private": false,
   "description": "Standardized build-time macros for ember apps.",
   "keywords": [
diff --git a/packages/router/package.json b/packages/router/package.json
index 9ea1dcfa9..4b7380713 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/router",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Lazy loading router",
   "keywords": [
     "ember-addon"
diff --git a/packages/shared-internals/package.json b/packages/shared-internals/package.json
index 83dfd27bd..660920702 100644
--- a/packages/shared-internals/package.json
+++ b/packages/shared-internals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/shared-internals",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "private": false,
   "description": "Utilities shared among the other embroider packages",
   "repository": {
diff --git a/packages/util/package.json b/packages/util/package.json
index 482c98257..910730758 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/util",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "Utilities for app and addon authors.",
   "keywords": [
     "ember-addon"
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 5aa4b4fec..1577b4c04 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/webpack",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "private": false,
   "description": "Builds EmberJS apps with Webpack",
   "repository": {