diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index a71bb90e7f2..ce6b51853a9 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -43,11 +43,11 @@
     "@ember/render-modifiers": "^2.1.0",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.3.0",
-    "@embroider/compat": "^3.5.4",
-    "@embroider/core": "^3.4.13",
+    "@embroider/compat": "^3.5.5",
+    "@embroider/core": "^3.4.14",
     "@embroider/macros": "^1.13.1",
     "@embroider/router": "^2.1.8",
-    "@embroider/webpack": "^4.0.3",
+    "@embroider/webpack": "^4.0.4",
     "@floating-ui/dom": "^1.6.5",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
diff --git a/yarn.lock b/yarn.lock
index 69689bc3913..3d900998b1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1449,10 +1449,10 @@
     "@babel/core" "^7.14.5"
     babel-loader "^9.0.0"
 
-"@embroider/compat@^3.5.4":
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-3.5.4.tgz#348efbd296a27f646332b882976ae7a4b0839040"
-  integrity sha512-WTHR2PnBYtFrHsDJ0glU8feWr5sMmb3eDolH4M0n3oUNzfEkerRqeosNHAjSfQTlJIh2KDHd4Pf2XYLhRrDFPg==
+"@embroider/compat@^3.5.5":
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-3.5.5.tgz#bdd57502b6bad96092c807a5b4f0f01e2514019e"
+  integrity sha512-AFdsoitgxdU4VDmoGJohvPJtcQ0hpNrueHDHaeY1agPw18+CD+NQNtKI6BbGltEvneNBgWn8xaRChNqj+1tXoQ==
   dependencies:
     "@babel/code-frame" "^7.14.5"
     "@babel/core" "^7.14.5"
@@ -1461,7 +1461,7 @@
     "@babel/preset-env" "^7.14.5"
     "@babel/runtime" "^7.18.6"
     "@babel/traverse" "^7.14.5"
-    "@embroider/macros" "1.16.4"
+    "@embroider/macros" "1.16.5"
     "@types/babel__code-frame" "^7.0.2"
     "@types/yargs" "^17.0.3"
     assert-never "^1.1.0"
@@ -1496,16 +1496,16 @@
     walk-sync "^3.0.0"
     yargs "^17.0.1"
 
-"@embroider/core@^3.4.13":
-  version "3.4.13"
-  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-3.4.13.tgz#bdec0ef364076fbf9af0087bbbcd0c630e045205"
-  integrity sha512-DQRVNJ3QwY6olZSOsaShNjSz74GReQzm6hMjydF5867v3conV61Pedgrn1thmvYrdLlOm20H+iqRDzllLiJZLg==
+"@embroider/core@^3.4.14":
+  version "3.4.14"
+  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-3.4.14.tgz#616d96f9bbb4d7e2f6a57cd09ec2590d44156392"
+  integrity sha512-WVVKup9j1LzciQDL3jfvADJIyLTPe3+cWKzZwqwSnDkYIx2Nsq5a/drKcjJZPJtwU1ddbMpDnUVgGtOurN1VcA==
   dependencies:
     "@babel/core" "^7.14.5"
     "@babel/parser" "^7.14.5"
     "@babel/traverse" "^7.14.5"
-    "@embroider/macros" "1.16.4"
-    "@embroider/shared-internals" "2.6.1"
+    "@embroider/macros" "1.16.5"
+    "@embroider/shared-internals" "2.6.2"
     assert-never "^1.2.1"
     babel-plugin-ember-template-compilation "^2.1.1"
     broccoli-node-api "^1.7.0"
@@ -1531,12 +1531,12 @@
   resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-3.0.3.tgz#73eee9a54fa893d4f48b7ffe05c40c26cb491dae"
   integrity sha512-sI2K3/III1WGGxS+aIf8uW5tgcNiE7APNhThn2ZTwqU47fK20Uz8TJZhst0GfNZFsCsmuQMRUikRJvQU8naSWA==
 
-"@embroider/macros@1.16.4", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.1", "@embroider/macros@^1.8.3":
-  version "1.16.4"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.16.4.tgz#0a4dd5a030f1446e234e19e8973647724530989a"
-  integrity sha512-xGPke1N8uD+RM4RCM1brfPWawDs7aSP1JQ+4VsTp1g2goI7vNtdMRQmKWWUUTqeV/rqk21ENpvy3r2oyufGW1w==
+"@embroider/macros@1.16.5", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.1", "@embroider/macros@^1.8.3":
+  version "1.16.5"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.16.5.tgz#871addab2103b554c6b6a3a337c00e3f0a0462ac"
+  integrity sha512-Oz8bUZvZzOV1Gk3qSgIzZJJzs6acclSTcEFyB+KdKbKqjTC3uebn53aU2gAlLU7/YdTRZrg2gNbQuwAp+tGkGg==
   dependencies:
-    "@embroider/shared-internals" "2.6.1"
+    "@embroider/shared-internals" "2.6.2"
     assert-never "^1.2.1"
     babel-import-util "^2.0.0"
     ember-cli-babel "^7.26.6"
@@ -1553,10 +1553,10 @@
     "@ember/test-waiters" "^3.0.2"
     "@embroider/addon-shim" "^1.8.9"
 
-"@embroider/shared-internals@2.6.1", "@embroider/shared-internals@^2.0.0", "@embroider/shared-internals@^2.6.0":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.6.1.tgz#415fa08258dca7e8396922da680d424a3e2e12f8"
-  integrity sha512-STU1oDP36JQY+zpivyAfXGXadN664d+DOiVNBUW+4AAuWLVxIRWDIuFj8UxzREXZU9trZY8vOhKwKQtfEgdwSg==
+"@embroider/shared-internals@2.6.2", "@embroider/shared-internals@^2.0.0", "@embroider/shared-internals@^2.6.0":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.6.2.tgz#66297a8606587108f9dbcbaa1a9dcc6b4a4ca605"
+  integrity sha512-jL3Bjn8C73AUBlTex+VixP7YmqvPNN/BZFB85odTstzLFOuR8y2mmGiuWbq17qNuFyoxc6xtndMnAeqwCXBNkA==
   dependencies:
     babel-import-util "^2.0.0"
     debug "^4.3.2"
@@ -1577,16 +1577,16 @@
     lodash "^4.17.21"
     resolve "^1.20.0"
 
-"@embroider/webpack@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-4.0.3.tgz#c6c77d0c6ce4094798fd0a34c5e4ff9762eaac86"
-  integrity sha512-bDjQfyI8O7xADDajfQ6IFHen4XirsNJ2Y3s0LzNw/USWYCD043G+K7wAsZ0HXfhkZKyj+uw60zeOWQuVrepWGQ==
+"@embroider/webpack@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-4.0.4.tgz#03ac61f2d3b3266d62f75211b627f36c0fe28419"
+  integrity sha512-U1c04geaofGvYtx1/ebF/4tCh2sPh1KJbee5+6U8n50fKwsmae+DpdfBsIcK02jTI/ndWnOkH4jWh3GiGryoiw==
   dependencies:
     "@babel/core" "^7.14.5"
     "@babel/preset-env" "^7.14.5"
     "@embroider/babel-loader-9" "3.1.1"
     "@embroider/hbs-loader" "3.0.3"
-    "@embroider/shared-internals" "2.6.1"
+    "@embroider/shared-internals" "2.6.2"
     "@types/supports-color" "^8.1.0"
     assert-never "^1.2.1"
     babel-loader "^8.2.2"