diff --git a/package.json b/package.json
index bc80ea187..3c853c0ca 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
 		"ember-cli-head": "1.0.0",
 		"ember-cli-inject-live-reload": "2.0.2",
 		"ember-cli-localforage": "2.0.6",
-		"ember-cli-mirage": "1.1.8",
+		"ember-cli-mirage": "2.0.0",
 		"ember-cli-sri": "2.1.1",
 		"ember-cli-string-helpers": "5.0.0",
 		"ember-cli-uglify": "3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5ada0651d..02a86ec10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3826,7 +3826,7 @@
     typescript-memoize "^1.0.0-alpha.3"
     walk-sync "^1.1.3"
 
-"@embroider/macros@0.33.0":
+"@embroider/macros@0.33.0", "@embroider/macros@^0.33.0":
   version "0.33.0"
   resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.33.0.tgz#d5826ea7565bb69b57ba81ed528315fe77acbf9d"
   integrity sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==
@@ -9661,17 +9661,18 @@ ember-cli-lodash-subset@^2.0.1:
   resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
   integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
 
-ember-cli-mirage@1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-1.1.8.tgz#b3874a0f2eb83d8f341416d3a691ff82735c629c"
-  integrity sha512-i0/CNwdyza+o+0RW92i/dEhAqTcyoAJ9jGKKiOLK74RwDG0Bgt5w/CdqKfIFBf/lIGPXHPveneWsyckeSiVr4A==
+ember-cli-mirage@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-2.0.0.tgz#b3a012e8115463899c46a9942dec55300bca5b42"
+  integrity sha512-rfM1PG3gTqTIg1pO40n+g8TOjhK1SAnPe4j7EfOrbmv1Ov81+CGhcPSJchkiShSGnOoTLnHXV6U9nEd+psc6jw==
   dependencies:
+    "@embroider/macros" "^0.33.0"
     broccoli-file-creator "^2.1.1"
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^3.0.2"
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
     ember-auto-import "^1.2.19"
     ember-cli-babel "^7.5.0"
-    ember-get-config "^0.2.2"
+    ember-get-config "^0.3.0"
     ember-inflector "^2.0.0 || ^3.0.0"
     lodash-es "^4.17.11"
     miragejs "^0.1.31"
@@ -10243,7 +10244,7 @@ ember-fetch@8.0.2:
     node-fetch "^2.6.0"
     whatwg-fetch "^3.4.0"
 
-ember-get-config@, ember-get-config@^0.2.2, ember-get-config@^0.2.4:
+ember-get-config@, ember-get-config@^0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.2.4.tgz#118492a2a03d73e46004ed777928942021fe1ecd"
   integrity sha1-EYSSoqA9c+RgBO13eSiUICH+Hs0=
@@ -10251,7 +10252,7 @@ ember-get-config@, ember-get-config@^0.2.2, ember-get-config@^0.2.4:
     broccoli-file-creator "^1.1.1"
     ember-cli-babel "^6.3.0"
 
-ember-get-config@0.3.0:
+ember-get-config@0.3.0, ember-get-config@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.3.0.tgz#a73a1a87b48d9dde4c66a0e52ed5260b8a48cfbd"
   integrity sha512-0e2pKzwW5lBZ4oJnvu9qHOht4sP1MWz/m3hyz8kpSoMdrlZVf62LDKZ6qfKgy8drcv5YhCMYE6QV7MhnqlrzEQ==