diff --git a/packages/test-app/package.json b/packages/test-app/package.json
index 8063ce84..22654d0f 100644
--- a/packages/test-app/package.json
+++ b/packages/test-app/package.json
@@ -35,7 +35,7 @@
     "@glimmer/tracking": "1.1.2",
     "broccoli-asset-rev": "3.0.0",
     "ember-auto-import": "2.8.1",
-    "ember-cli": "5.12.0",
+    "ember-cli": "6.0.0",
     "ember-cli-babel": "8.2.0",
     "ember-cli-dependency-checker": "3.3.2",
     "ember-cli-fastboot": "4.1.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 752ecde0..e9f6f8c9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -112,14 +112,14 @@ importers:
         specifier: 2.8.1
         version: 2.8.1(webpack@5.95.0)
       ember-cli:
-        specifier: 5.12.0
-        version: 5.12.0(handlebars@4.7.8)(underscore@1.13.7)
+        specifier: 6.0.0
+        version: 6.0.0(handlebars@4.7.8)(underscore@1.13.7)
       ember-cli-babel:
         specifier: 8.2.0
         version: 8.2.0(@babel/core@7.25.8)
       ember-cli-dependency-checker:
         specifier: 3.3.2
-        version: 3.3.2(ember-cli@5.12.0(handlebars@4.7.8)(underscore@1.13.7))
+        version: 3.3.2(ember-cli@6.0.0(handlebars@4.7.8)(underscore@1.13.7))
       ember-cli-fastboot:
         specifier: 4.1.5
         version: 4.1.5(ember-source@5.12.0(@glimmer/component@2.0.0)(rsvp@4.8.5)(webpack@5.95.0))
@@ -531,12 +531,6 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-decorators@7.25.7':
-    resolution: {integrity: sha512-oXduHo642ZhstLVYTe2z2GSJIruU0c/W3/Ghr6A5yGMsVrvdnxO1z+3pbTcT7f3/Clnt+1z8D/w1r1f1SHaCHw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
   '@babel/plugin-syntax-decorators@7.25.9':
     resolution: {integrity: sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==}
     engines: {node: '>=6.9.0'}
@@ -1997,6 +1991,9 @@ packages:
   babel-plugin-syntax-dynamic-import@6.18.0:
     resolution: {integrity: sha512-MioUE+LfjCEz65Wf7Z/Rm4XCP5k2c+TbMd2Z2JKc7U9uwjBhAfNPE48KC4GTGKhppMeYVepwDBNO/nGY6NYHBA==}
 
+  babel-remove-types@1.0.0:
+    resolution: {integrity: sha512-Kg+NZLwfe1E+LoGrkX9I9nFDM1FVBoiIdyW4bjNGGvrqWhvgcdauqijOFn5/WYkdoGXpUEDRWvU4X100ghVx4A==}
+
   backbone@1.6.0:
     resolution: {integrity: sha512-13PUjmsgw/49EowNcQvfG4gmczz1ximTMhUktj0Jfrjth0MVaTxehpU+qYYX4MxnuIuhmvBLC6/ayxuAGnOhbA==}
 
@@ -3047,8 +3044,8 @@ packages:
     resolution: {integrity: sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==}
     engines: {node: 10.* || >= 12.*}
 
-  ember-cli@5.12.0:
-    resolution: {integrity: sha512-48ZOoUZTXsav37RIYY9gyCR35yo64mhzfv5YHtTbsZZwLv/HjvTz27X0CTvkfVQaOWHYDFekxdp9ppaKz84VNA==}
+  ember-cli@6.0.0:
+    resolution: {integrity: sha512-0ljvckoeZz+lnxiQbyJQ0BnMhKgBQJ/WPFYzWcAW2KUWgt1nvJg2gqqqiH9Dk91/cxz2QjBl0ghl0y9tD0S/Bg==}
     engines: {node: '>= 18'}
     hasBin: true
 
@@ -7084,11 +7081,6 @@ snapshots:
       '@babel/core': 7.25.8
       '@babel/helper-plugin-utils': 7.25.7
 
-  '@babel/plugin-syntax-decorators@7.25.7(@babel/core@7.25.8)':
-    dependencies:
-      '@babel/core': 7.25.8
-      '@babel/helper-plugin-utils': 7.25.7
-
   '@babel/plugin-syntax-decorators@7.25.9(@babel/core@7.25.8)':
     dependencies:
       '@babel/core': 7.25.8
@@ -9058,6 +9050,15 @@ snapshots:
 
   babel-plugin-syntax-dynamic-import@6.18.0: {}
 
+  babel-remove-types@1.0.0:
+    dependencies:
+      '@babel/core': 7.25.8
+      '@babel/plugin-syntax-decorators': 7.25.9(@babel/core@7.25.8)
+      '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.8)
+      prettier: 2.8.8
+    transitivePeerDependencies:
+      - supports-color
+
   backbone@1.6.0:
     dependencies:
       underscore: 1.13.7
@@ -10276,10 +10277,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ember-cli-dependency-checker@3.3.2(ember-cli@5.12.0(handlebars@4.7.8)(underscore@1.13.7)):
+  ember-cli-dependency-checker@3.3.2(ember-cli@6.0.0(handlebars@4.7.8)(underscore@1.13.7)):
     dependencies:
       chalk: 2.4.2
-      ember-cli: 5.12.0(handlebars@4.7.8)(underscore@1.13.7)
+      ember-cli: 6.0.0(handlebars@4.7.8)(underscore@1.13.7)
       find-yarn-workspace-root: 1.2.1
       is-git-url: 1.0.0
       resolve: 1.22.8
@@ -10471,9 +10472,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ember-cli@5.12.0(handlebars@4.7.8)(underscore@1.13.7):
+  ember-cli@6.0.0(handlebars@4.7.8)(underscore@1.13.7):
     dependencies:
       '@pnpm/find-workspace-dir': 6.0.3
+      babel-remove-types: 1.0.0
       broccoli: 3.5.2
       broccoli-builder: 0.18.14
       broccoli-concat: 4.2.5
@@ -10540,7 +10542,6 @@ snapshots:
       promise-map-series: 0.3.0
       promise.hash.helper: 1.0.8
       quick-temp: 0.1.8
-      remove-types: 1.0.0
       resolve: 1.22.8
       resolve-package-path: 4.0.3
       safe-stable-stringify: 2.5.0
@@ -13554,7 +13555,7 @@ snapshots:
   remove-types@1.0.0:
     dependencies:
       '@babel/core': 7.25.8
-      '@babel/plugin-syntax-decorators': 7.25.7(@babel/core@7.25.8)
+      '@babel/plugin-syntax-decorators': 7.25.9(@babel/core@7.25.8)
       '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.8)
       prettier: 2.8.8
     transitivePeerDependencies: