diff --git a/.release-plan.json b/.release-plan.json
index b72f4b0f0..8e2101abb 100644
--- a/.release-plan.json
+++ b/.release-plan.json
@@ -11,24 +11,24 @@
     },
     "@embroider/compat": {
       "impact": "patch",
-      "oldVersion": "3.5.2",
-      "newVersion": "3.5.3",
+      "oldVersion": "3.5.3",
+      "newVersion": "3.5.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": {
       "impact": "patch",
-      "oldVersion": "3.4.11",
-      "newVersion": "3.4.12",
+      "oldVersion": "3.4.12",
+      "newVersion": "3.4.13",
       "constraints": [
         {
           "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
+          "reason": "Has dependency `workspace:*` on @embroider/macros"
         }
       ],
       "pkgJSONPath": "./packages/core/package.json"
@@ -37,7 +37,16 @@
       "oldVersion": "3.0.3"
     },
     "@embroider/macros": {
-      "oldVersion": "1.16.3"
+      "impact": "patch",
+      "oldVersion": "1.16.3",
+      "newVersion": "1.16.4",
+      "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
+        }
+      ],
+      "pkgJSONPath": "./packages/macros/package.json"
     },
     "@embroider/reverse-exports": {
       "oldVersion": "0.1.0"
@@ -61,5 +70,5 @@
       "oldVersion": "4.0.3"
     }
   },
-  "description": "## Release (2024-06-13)\n\n@embroider/compat 3.5.3 (patch)\n@embroider/core 3.4.12 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/compat`, `@embroider/core`, `@embroider/sample-transforms`\n  * [#1969](https://github.com/embroider-build/embroider/pull/1969) Update `fast-sourcemap-concat` to remove dependency `lodash.template` for consumer apps (security vulnerability) ([@mkszepp](https://github.com/mkszepp))\n\n#### Committers: 1\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n"
+  "description": "## Release (2024-06-20)\n\n@embroider/compat 3.5.4 (patch)\n@embroider/core 3.4.13 (patch)\n@embroider/macros 1.16.4 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/macros`\n  * [#1994](https://github.com/embroider-build/embroider/pull/1994) MacrosConfig should sync globalConfigs between copies ([@ef4](https://github.com/ef4))\n\n#### :house: Internal\n* [#1993](https://github.com/embroider-build/embroider/pull/1993) update node to latest LTS for CI ([@mansona](https://github.com/mansona))\n\n#### Committers: 2\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42f622690..0078b4e2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Embroider Changelog
 
+## Release (2024-06-20)
+
+@embroider/compat 3.5.4 (patch)
+@embroider/core 3.4.13 (patch)
+@embroider/macros 1.16.4 (patch)
+
+#### :bug: Bug Fix
+* `@embroider/macros`
+  * [#1994](https://github.com/embroider-build/embroider/pull/1994) MacrosConfig should sync globalConfigs between copies ([@ef4](https://github.com/ef4))
+
+#### :house: Internal
+* [#1993](https://github.com/embroider-build/embroider/pull/1993) update node to latest LTS for CI ([@mansona](https://github.com/mansona))
+
+#### Committers: 2
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Edward Faulkner ([@ef4](https://github.com/ef4))
+
 ## Release (2024-06-13)
 
 @embroider/compat 3.5.3 (patch)
diff --git a/packages/compat/package.json b/packages/compat/package.json
index 7a5066c3e..f3fdea9f7 100644
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.5.3",
+  "version": "3.5.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 38d59848a..11e692a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.12",
+  "version": "3.4.13",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
diff --git a/packages/macros/package.json b/packages/macros/package.json
index 7b4894d60..541bdff5d 100644
--- a/packages/macros/package.json
+++ b/packages/macros/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/macros",
-  "version": "1.16.3",
+  "version": "1.16.4",
   "private": false,
   "description": "Standardized build-time macros for ember apps.",
   "keywords": [