diff --git a/package.json b/package.json
index 010005d1f..af72581e1 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "ember-linkify": "^4.1",
     "ember-load-initializers": "^2.1",
     "ember-maybe-import-regenerator": "^1.0",
-    "ember-moment": "^9.0",
+    "ember-moment": "^10.0",
     "ember-pikaday": "^3.0",
     "ember-power-select": "^5.0",
     "ember-promise-helpers": "^2.0",
diff --git a/yarn.lock b/yarn.lock
index d6e2e5ae9..9625533e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2038,6 +2038,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@embroider/addon-shim@npm:^0.50.2":
+  version: 0.50.2
+  resolution: "@embroider/addon-shim@npm:0.50.2"
+  dependencies:
+    "@embroider/shared-internals": ^0.50.2
+    semver: ^7.3.5
+  checksum: 14076ec7c1dd5b29c1450711c37986c70d72148cff42c8114a532473ee059257a4eec7bdb933bb774c16d98420e920112e8f4ed57b42af998103c0b802fe47de
+  languageName: node
+  linkType: hard
+
 "@embroider/core@npm:0.33.0, @embroider/core@npm:^0.33.0":
   version: 0.33.0
   resolution: "@embroider/core@npm:0.33.0"
@@ -2213,6 +2223,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@embroider/shared-internals@npm:^0.50.2":
+  version: 0.50.2
+  resolution: "@embroider/shared-internals@npm:0.50.2"
+  dependencies:
+    babel-import-util: ^1.1.0
+    ember-rfc176-data: ^0.3.17
+    fs-extra: ^9.1.0
+    lodash: ^4.17.21
+    resolve-package-path: ^4.0.1
+    semver: ^7.3.5
+    typescript-memoize: ^1.0.1
+  checksum: 340426b9bb8cd43caa0db2c9455c6443c71e6ea37509e5555a1ac50db619f0cf42aa094807769571a0f81d3625f592a8626a7438440b52684eccb4c026d94ccf
+  languageName: node
+  linkType: hard
+
 "@embroider/util@npm:^0.39.1":
   version: 0.39.1
   resolution: "@embroider/util@npm:0.39.1"
@@ -3918,7 +3943,7 @@ __metadata:
     ember-linkify: ^4.1
     ember-load-initializers: ^2.1
     ember-maybe-import-regenerator: ^1.0
-    ember-moment: ^9.0
+    ember-moment: ^10.0
     ember-pikaday: ^3.0
     ember-power-select: ^5.0
     ember-promise-helpers: ^2.0
@@ -4675,6 +4700,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-import-util@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "babel-import-util@npm:1.1.0"
+  checksum: d4e965a18ebeee78cd69f1735ab10b64e693b5d837cd887c7ce9f03756d55a49a9f434e29077eafc5bb1f15589dad5ceb1efece78a750d4fc2f0451d5a69da9d
+  languageName: node
+  linkType: hard
+
 "babel-loader@npm:^8.0.6":
   version: 8.2.2
   resolution: "babel-loader@npm:8.2.2"
@@ -8159,9 +8191,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ember-auto-import@npm:^1.10.1, ember-auto-import@npm:^1.11.3, ember-auto-import@npm:^1.12.0":
-  version: 1.12.0
-  resolution: "ember-auto-import@npm:1.12.0"
+"ember-auto-import@npm:^1.11.2":
+  version: 1.11.3
+  resolution: "ember-auto-import@npm:1.11.3"
   dependencies:
     "@babel/core": ^7.1.6
     "@babel/preset-env": ^7.10.2
@@ -8192,13 +8224,13 @@ __metadata:
     typescript-memoize: ^1.0.0-alpha.3
     walk-sync: ^0.3.3
     webpack: ^4.43.0
-  checksum: 689de6088854855c7eb50d882a81fc9ee3efd1671ddd8aea35a7d6ef0db8e08d211d156b63390da4fd98518d32ad2a3f9ed9be6f25810311a9011604f10b3c85
+  checksum: 2ac4e08696f46b4e9e1ada49c068d5ca7a338e063ea47e332f81e72613ae287479504b1246e97b31bed7ca6a84ec7928d250e0de6f5bc7c6412a7e537532684b
   languageName: node
   linkType: hard
 
-"ember-auto-import@npm:^1.11.2":
-  version: 1.11.3
-  resolution: "ember-auto-import@npm:1.11.3"
+"ember-auto-import@npm:^1.11.3, ember-auto-import@npm:^1.12.0":
+  version: 1.12.0
+  resolution: "ember-auto-import@npm:1.12.0"
   dependencies:
     "@babel/core": ^7.1.6
     "@babel/preset-env": ^7.10.2
@@ -8229,7 +8261,7 @@ __metadata:
     typescript-memoize: ^1.0.0-alpha.3
     walk-sync: ^0.3.3
     webpack: ^4.43.0
-  checksum: 2ac4e08696f46b4e9e1ada49c068d5ca7a338e063ea47e332f81e72613ae287479504b1246e97b31bed7ca6a84ec7928d250e0de6f5bc7c6412a7e537532684b
+  checksum: 689de6088854855c7eb50d882a81fc9ee3efd1671ddd8aea35a7d6ef0db8e08d211d156b63390da4fd98518d32ad2a3f9ed9be6f25810311a9011604f10b3c85
   languageName: node
   linkType: hard
 
@@ -9653,16 +9685,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ember-moment@npm:^9.0":
-  version: 9.0.1
-  resolution: "ember-moment@npm:9.0.1"
+"ember-moment@npm:^10.0":
+  version: 10.0.0
+  resolution: "ember-moment@npm:10.0.0"
   dependencies:
-    ember-auto-import: ^1.10.1
-    ember-cli-babel: ^7.23.0
-    ember-cli-htmlbars: ^5.3.1
-    moment: ^2.29.1
-    moment-timezone: ^0.5.33
-  checksum: 902a509c00383f798fa96b49c986d84d164c411861749561655627e1cd74c882b6776e8fa75efdd376ad1460234244fc8dcb7a58b694fad7340108b5d768dde0
+    "@embroider/addon-shim": ^0.50.2
+  peerDependencies:
+    moment: ^2
+    moment-timezone: ^0.5.34
+  peerDependenciesMeta:
+    moment:
+      optional: true
+    moment-timezone:
+      optional: true
+  checksum: f01fa430f71ed4cc1149d62ef9c9dd18303263f37ece62f27912c31332e253c353a5719b41d4c9fe0a1955f5b99aaceda4b647e6678e5f49ab8bbe6f572042ea
   languageName: node
   linkType: hard
 
@@ -15031,16 +15067,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment-timezone@npm:^0.5.33":
-  version: 0.5.34
-  resolution: "moment-timezone@npm:0.5.34"
-  dependencies:
-    moment: ">= 2.9.0"
-  checksum: 12a1d3d52e4ba509cf1fa36bbda59d898a08fa80ab35f6c358747e93aec1f07e617cec647eaf2e8acf5f9132e581d4704d34a9edffa9a80c5cd04bf23b277595
-  languageName: node
-  linkType: hard
-
-"moment@npm:>= 2.9.0, moment@npm:^2.19.3, moment@npm:^2.29.1":
+"moment@npm:>= 2.9.0, moment@npm:^2.19.3":
   version: 2.29.1
   resolution: "moment@npm:2.29.1"
   checksum: 1e14d5f422a2687996be11dd2d50c8de3bd577c4a4ca79ba5d02c397242a933e5b941655de6c8cb90ac18f01cc4127e55b4a12ae3c527a6c0a274e455979345e